@@ -33,7 +33,7 @@ |
||
33 | 33 | { |
34 | 34 | $activityparameters = new ActivityParameters(); |
35 | 35 | |
36 | - foreach($params as $key => $value) { |
|
36 | + foreach ($params as $key => $value) { |
|
37 | 37 | if (property_exists($activityparameters, $key)) { |
38 | 38 | $activityparameters->{$key} = $value; |
39 | 39 | } |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | |
8 | 8 | class Territory extends Common |
9 | 9 | { |
10 | - public $territory_id; // Territory id |
|
10 | + public $territory_id; // Territory id |
|
11 | 11 | public $territory_name; |
12 | 12 | public $territory_color; |
13 | 13 | public $addresses; |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | |
30 | 30 | $territoryparameters = new Territory(); |
31 | 31 | |
32 | - foreach($params as $key => $value) { |
|
32 | + foreach ($params as $key => $value) { |
|
33 | 33 | if (property_exists($territoryparameters, $key)) { |
34 | 34 | $territoryparameters->{$key} = $value; |
35 | 35 | } |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | $param->setParameters(RouteParameters::fromArray($params['parameters'])); |
35 | 35 | } |
36 | 36 | |
37 | - foreach($params['addresses'] as $address) { |
|
37 | + foreach ($params['addresses'] as $address) { |
|
38 | 38 | if (!($address instanceof Address)) { |
39 | 39 | $address = Address::fromArray($address); |
40 | 40 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | { |
78 | 78 | $addresses = array(); |
79 | 79 | |
80 | - foreach($this->addresses as $address) { |
|
80 | + foreach ($this->addresses as $address) { |
|
81 | 81 | $addresses[] = $address->toArray(); |
82 | 82 | } |
83 | 83 |
@@ -44,18 +44,18 @@ |
||
44 | 44 | const ORDER_V4 = '/api.v4/order.php'; |
45 | 45 | |
46 | 46 | const ROUTE_V4 = '/api.v4/route.php'; |
47 | - const ROUTE_DUPLICATE ='/actions/duplicate_route.php'; |
|
48 | - const ROUTES_DELETE ='/actions/delete_routes.php'; |
|
49 | - const REOPTIMIZE_V3_2 ='/api.v3/route/reoptimize_2.php'; |
|
50 | - const ROUTES_MERGE ='/actions/merge_routes.php'; |
|
51 | - const ROUTE_SHARE ='/actions/route/share_route.php'; |
|
52 | - const ROUTE_NOTES_ADD ='/actions/addRouteNotes.php'; |
|
53 | - const STATUS_V4 ='/api.v4/status.php'; |
|
54 | - const GET_DEVICE_LOCATION ='/api/track/get_device_location.php'; |
|
55 | - |
|
56 | - const TRACK_SET ='/track/set.php'; |
|
57 | - |
|
58 | - const NOTE_CUSTOM_TYPES_V4 ='/api.v4/note_custom_types.php'; |
|
47 | + const ROUTE_DUPLICATE = '/actions/duplicate_route.php'; |
|
48 | + const ROUTES_DELETE = '/actions/delete_routes.php'; |
|
49 | + const REOPTIMIZE_V3_2 = '/api.v3/route/reoptimize_2.php'; |
|
50 | + const ROUTES_MERGE = '/actions/merge_routes.php'; |
|
51 | + const ROUTE_SHARE = '/actions/route/share_route.php'; |
|
52 | + const ROUTE_NOTES_ADD = '/actions/addRouteNotes.php'; |
|
53 | + const STATUS_V4 = '/api.v4/status.php'; |
|
54 | + const GET_DEVICE_LOCATION = '/api/track/get_device_location.php'; |
|
55 | + |
|
56 | + const TRACK_SET = '/track/set.php'; |
|
57 | + |
|
58 | + const NOTE_CUSTOM_TYPES_V4 = '/api.v4/note_custom_types.php'; |
|
59 | 59 | |
60 | 60 | const VEHICLE_V4 = '/api/vehicles'; |
61 | 61 | } |
@@ -10,6 +10,6 @@ |
||
10 | 10 | const TSP_TW = 5; |
11 | 11 | const TSP_TW_CR = 6; |
12 | 12 | const BBCVRP = 7; |
13 | - const ALG_NONE = 100; |
|
13 | + const ALG_NONE = 100; |
|
14 | 14 | const ALG_LEGACY_DISTRIBUTED = 101; |
15 | 15 | } |
@@ -59,14 +59,14 @@ discard block |
||
59 | 59 | public $weight_metric; |
60 | 60 | public $max_weight_per_axle_group_metric; |
61 | 61 | |
62 | - public function __construct () |
|
62 | + public function __construct() |
|
63 | 63 | { |
64 | 64 | Route4Me::setBaseUrl(Endpoint::WH_BASE_URL); |
65 | 65 | } |
66 | 66 | |
67 | 67 | public static function fromArray(array $params) { |
68 | - $vehicle= new Vehicle(); |
|
69 | - foreach($params as $key => $value) { |
|
68 | + $vehicle = new Vehicle(); |
|
69 | + foreach ($params as $key => $value) { |
|
70 | 70 | if (property_exists($vehicle, $key)) { |
71 | 71 | $vehicle->{$key} = $value; |
72 | 72 | } |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | return $response; |
91 | 91 | } |
92 | 92 | |
93 | - public function getRandomVehicleId($page,$perPage) |
|
93 | + public function getRandomVehicleId($page, $perPage) |
|
94 | 94 | { |
95 | 95 | $query['page'] = isset($page) ? $page : 1; |
96 | 96 | $query['perPage'] = isset($perPage) ? $perPage : 10; |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | if (!isset($vehicles['data'])) return null; |
103 | 103 | if (sizeof($vehicles['data'])<1) return null; |
104 | 104 | |
105 | - $randomIndex = rand(0, sizeof($vehicles['data'])-1); |
|
105 | + $randomIndex = rand(0, sizeof($vehicles['data']) - 1); |
|
106 | 106 | |
107 | 107 | return $vehicles['data'][$randomIndex]['vehicle_id']; |
108 | 108 | } |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | public function getVehicleByID($vehicleID) |
111 | 111 | { |
112 | 112 | $response = Route4Me::makeRequst(array( |
113 | - 'url' => Endpoint::VEHICLE_V4 . '/' . $vehicleID, |
|
113 | + 'url' => Endpoint::VEHICLE_V4.'/'.$vehicleID, |
|
114 | 114 | 'method' => 'GET' |
115 | 115 | )); |
116 | 116 | |
@@ -123,9 +123,9 @@ discard block |
||
123 | 123 | |
124 | 124 | $body = array(); |
125 | 125 | |
126 | - $vehicle= new Vehicle(); |
|
126 | + $vehicle = new Vehicle(); |
|
127 | 127 | |
128 | - foreach($params as $key => $value) { |
|
128 | + foreach ($params as $key => $value) { |
|
129 | 129 | if ($key=="vehicle_id") continue; |
130 | 130 | if (property_exists($vehicle, $key)) { |
131 | 131 | if (isset($params->{$key})) { |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | } |
136 | 136 | |
137 | 137 | $response = Route4Me::makeRequst(array( |
138 | - 'url' => Endpoint::VEHICLE_V4 . '/' . $vehicleID, |
|
138 | + 'url' => Endpoint::VEHICLE_V4.'/'.$vehicleID, |
|
139 | 139 | 'method' => 'PUT', |
140 | 140 | 'body' => $body, |
141 | 141 | 'HTTPHEADER' => 'Content-Type: application/json' |
@@ -148,9 +148,9 @@ discard block |
||
148 | 148 | { |
149 | 149 | $body = array(); |
150 | 150 | |
151 | - $vehicle= new Vehicle(); |
|
151 | + $vehicle = new Vehicle(); |
|
152 | 152 | |
153 | - foreach($params as $key => $value) { |
|
153 | + foreach ($params as $key => $value) { |
|
154 | 154 | if ($key=="vehicle_id") continue; |
155 | 155 | if (property_exists($vehicle, $key)) { |
156 | 156 | if (isset($params->{$key})) { |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | $vehicleID = isset($params->vehicle_id) ? $params->vehicle_id : null; |
175 | 175 | |
176 | 176 | $response = Route4Me::makeRequst(array( |
177 | - 'url' => Endpoint::VEHICLE_V4 . '/' . $vehicleID, |
|
177 | + 'url' => Endpoint::VEHICLE_V4.'/'.$vehicleID, |
|
178 | 178 | 'method' => 'DELETE', |
179 | 179 | 'HTTPHEADER' => 'Content-Type: application/json' |
180 | 180 | )); |
@@ -65,9 +65,9 @@ discard block |
||
65 | 65 | |
66 | 66 | public static function fromArray(array $params) |
67 | 67 | { |
68 | - $member= new Member(); |
|
68 | + $member = new Member(); |
|
69 | 69 | |
70 | - foreach($params as $key => $value) { |
|
70 | + foreach ($params as $key => $value) { |
|
71 | 71 | if (property_exists($member, $key)) { |
72 | 72 | $member->{$key} = $value; |
73 | 73 | } |
@@ -118,13 +118,13 @@ discard block |
||
118 | 118 | 'url' => Endpoint::VERIFY_DEVICE_LICENSE, |
119 | 119 | 'method' => 'POST', |
120 | 120 | 'query' => array( |
121 | - 'device_id' => isset($body->device_id) ? $body->device_id : null, |
|
121 | + 'device_id' => isset($body->device_id) ? $body->device_id : null, |
|
122 | 122 | 'device_type' => isset($body->device_type) ? $body->device_type : null, |
123 | 123 | ), |
124 | 124 | 'body' => array( |
125 | - 'device_id' => isset($body->device_id) ? $body->device_id : null, |
|
125 | + 'device_id' => isset($body->device_id) ? $body->device_id : null, |
|
126 | 126 | 'device_type' => isset($body->device_type) ? $body->device_type : null, |
127 | - 'format' => isset($body->format) ? $body->format : null |
|
127 | + 'format' => isset($body->format) ? $body->format : null |
|
128 | 128 | ) |
129 | 129 | |
130 | 130 | )); |
@@ -170,13 +170,13 @@ discard block |
||
170 | 170 | |
171 | 171 | foreach ($members['results'] as $memb) { |
172 | 172 | if (isset($memb['member_id']) && isset($memb['member_type'])) { |
173 | - if ($memberType==$memb['member_type']) $memberIDs[]=$memb['member_id']; |
|
173 | + if ($memberType==$memb['member_type']) $memberIDs[] = $memb['member_id']; |
|
174 | 174 | } |
175 | 175 | } |
176 | 176 | |
177 | 177 | if (sizeof($memberIDs)<1) return null; |
178 | 178 | |
179 | - $randomIndex = rand(0, sizeof($memberIDs)-1); |
|
179 | + $randomIndex = rand(0, sizeof($memberIDs) - 1); |
|
180 | 180 | |
181 | 181 | return $memberIDs[$randomIndex]; |
182 | 182 | } |
@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | |
8 | 8 | class AvoidanceZone extends Common |
9 | 9 | { |
10 | - public $territory_id; // Avoidance zone id |
|
10 | + public $territory_id; // Avoidance zone id |
|
11 | 11 | public $territory_name; |
12 | 12 | public $territory_color; |
13 | 13 | public $orders; |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | |
31 | 31 | $avoidanceZoneParameters = new AvoidanceZone(); |
32 | 32 | |
33 | - foreach($params as $key => $value) { |
|
33 | + foreach ($params as $key => $value) { |
|
34 | 34 | if (property_exists($avoidanceZoneParameters, $key)) { |
35 | 35 | $avoidanceZoneParameters->{$key} = $value; |
36 | 36 | } |
@@ -1,7 +1,7 @@ |
||
1 | 1 | <?php |
2 | 2 | namespace Route4Me; |
3 | 3 | |
4 | -$root = realpath(dirname(__FILE__) . '/../../'); |
|
4 | +$root = realpath(dirname(__FILE__).'/../../'); |
|
5 | 5 | require $root.'/vendor/autoload.php'; |
6 | 6 | |
7 | 7 | use Route4Me\Route4Me; |