Commit b89312d4 authored by istos's avatar istos

Merge branch 'BAT_NG' into 7.x-2.x

parents c25b6838 ba83ce18
......@@ -5,7 +5,6 @@ php = 5.3.9
package = BAT
dependencies[] = bat_availability
dependencies[] = rest_server
dependencies[] = services
......
This diff is collapsed.
......@@ -12,7 +12,7 @@ function bat_api_default_services_endpoint() {
$endpoint->api_version = 3;
$endpoint->name = 'bat_api';
$endpoint->server = 'rest_server';
$endpoint->path = 'bat/v1';
$endpoint->path = 'bat/v2';
$endpoint->authentication = array(
'services' => 'services',
);
......@@ -36,7 +36,7 @@ function bat_api_default_services_endpoint() {
),
);
$endpoint->resources = array(
'units' => array(
'events' => array(
'operations' => array(
'index' => array(
'enabled' => '1',
......@@ -45,23 +45,15 @@ function bat_api_default_services_endpoint() {
'enabled' => '1',
),
),
'actions' => array(
'add' => array(
'enabled' => '1',
),
),
),
'availability' => array(
'events-calendar' => array(
'operations' => array(
'index' => array(
'enabled' => '1',
),
'update' => array(
'enabled' => '1',
),
),
),
'pricing' => array(
'units' => array(
'operations' => array(
'index' => array(
'enabled' => '1',
......@@ -70,15 +62,15 @@ function bat_api_default_services_endpoint() {
'enabled' => '1',
),
),
),
'booking' => array(
'operations' => array(
'index' => array(
'actions' => array(
'add' => array(
'enabled' => '1',
),
),
'actions' => array(
'add' => array(
),
'units-calendar' => array(
'operations' => array(
'index' => array(
'enabled' => '1',
),
),
......@@ -87,6 +79,11 @@ function bat_api_default_services_endpoint() {
'actions' => array(
'login' => array(
'enabled' => '1',
'settings' => array(
'services' => array(
'resource_api_version' => '1.0',
),
),
),
'logout' => array(
'enabled' => '1',
......@@ -96,6 +93,9 @@ function bat_api_default_services_endpoint() {
),
),
),
'token' => array(
'enabled' => '1',
),
),
),
);
......
<?php
interface BatUnitFieldHandlerInterface {
public function getFieldType();
public function getFieldType();
public function getFieldInfo();
public function getFieldInfo();
}
abstract class BatUnitFieldHandlerBase implements BatUnitFieldHandlerInterface {
protected $unit;
protected $unit;
public function __construct(BatUnit $unit) {
$this->unit = $unit;
}
public function __construct(BatUnit $unit) {
$this->unit = $unit;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment