@@ -66,7 +66,7 @@ |
||
| 66 | 66 | $answer = $this->checkTTN($ttns, $phone); |
| 67 | 67 | $statuses = []; |
| 68 | 68 | |
| 69 | - if ($answer['success'] && ! empty($answer['result'])) { |
|
| 69 | + if ($answer['success'] && !empty($answer['result'])) { |
|
| 70 | 70 | foreach ($answer['result'] as $key => $status) { |
| 71 | 71 | $statuses[$key]['Number'] = $status['Number']; |
| 72 | 72 | $statuses[$key]['StatusCode'] = $status['StatusCode']; |
@@ -33,7 +33,7 @@ |
||
| 33 | 33 | { |
| 34 | 34 | $this->mergeConfigFrom(__DIR__.'/../config/novaposhta.php', 'novaposhta'); |
| 35 | 35 | |
| 36 | - $this->app->singleton('novaposhta', function () { |
|
| 36 | + $this->app->singleton('novaposhta', function() { |
|
| 37 | 37 | return $this->app->make(NovaPoshta::class); |
| 38 | 38 | }); |
| 39 | 39 | |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | */ |
| 32 | 32 | public function getApi() |
| 33 | 33 | { |
| 34 | - if (! $this->api) { |
|
| 34 | + if (!$this->api) { |
|
| 35 | 35 | $this->api = config('novaposhta.api_key'); |
| 36 | 36 | } |
| 37 | 37 | |
@@ -89,12 +89,12 @@ discard block |
||
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | $answer = $response->json(); |
| 92 | - if (! $auth && isset($answer[0])) { |
|
| 92 | + if (!$auth && isset($answer[0])) { |
|
| 93 | 93 | //костыль для НовойПочты. Спасибо Вам большое :) |
| 94 | 94 | $answer = $answer[0]; |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - if (! isset($answer['success']) || ! isset($answer['data']) || empty($answer['data'])) { |
|
| 97 | + if (!isset($answer['success']) || !isset($answer['data']) || empty($answer['data'])) { |
|
| 98 | 98 | // что-то не так в ответе |
| 99 | 99 | $info = trans('novaposhta::novaposhta.error_answer'); |
| 100 | 100 | $success = false; |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | } |
| 121 | 121 | } |
| 122 | 122 | |
| 123 | - if (! $info && isset($answer['info'])) { |
|
| 123 | + if (!$info && isset($answer['info'])) { |
|
| 124 | 124 | $info = $answer['info']; |
| 125 | 125 | } |
| 126 | 126 | |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | */ |
| 55 | 55 | public function getCounterpartyType() |
| 56 | 56 | { |
| 57 | - if (! $this->counterpartyType) { |
|
| 57 | + if (!$this->counterpartyType) { |
|
| 58 | 58 | $this->counterpartyType = 'PrivatePerson'; |
| 59 | 59 | } |
| 60 | 60 | |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | return $this; |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - if (! $this->counterpartyProperty) { |
|
| 77 | + if (!$this->counterpartyProperty) { |
|
| 78 | 78 | $this->counterpartyProperty = 'Recipient'; |
| 79 | 79 | } |
| 80 | 80 | |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | //указываем строками проверяем и вставляем |
| 36 | - if (isset($Recipient['RecipientName']) && //имя получателя |
|
| 36 | + if (isset($Recipient['RecipientName']) && //имя получателя |
|
| 37 | 37 | isset($Recipient['RecipientCityName']) && //город |
| 38 | 38 | isset($Recipient['RecipientAddressName']) //отделение или улица |
| 39 | 39 | ) { |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | |
| 70 | 70 | public function getRecipientType() |
| 71 | 71 | { |
| 72 | - if (! $this->RecipientType) { |
|
| 72 | + if (!$this->RecipientType) { |
|
| 73 | 73 | $this->RecipientType = config('novaposhta.recipient_type'); |
| 74 | 74 | } |
| 75 | 75 | $this->methodProperties['RecipientType'] = $this->RecipientType; |
@@ -33,7 +33,7 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | public function getPayerType() |
| 35 | 35 | { |
| 36 | - if (! $this->PayerType) { |
|
| 36 | + if (!$this->PayerType) { |
|
| 37 | 37 | $this->PayerType = config('novaposhta.payer_type'); |
| 38 | 38 | } |
| 39 | 39 | $this->methodProperties['PayerType'] = $this->PayerType; |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | public function getServiceType() |
| 59 | 59 | { |
| 60 | - if (! $this->ServiceType) { |
|
| 60 | + if (!$this->ServiceType) { |
|
| 61 | 61 | $this->ServiceType = config('novaposhta.service_type'); |
| 62 | 62 | } |
| 63 | 63 | $this->methodProperties['ServiceType'] = $this->ServiceType; |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | |
| 82 | 82 | public function getPaymentMethod() |
| 83 | 83 | { |
| 84 | - if (! $this->PaymentMethod) { |
|
| 84 | + if (!$this->PaymentMethod) { |
|
| 85 | 85 | $this->PaymentMethod = config('novaposhta.payment_method'); |
| 86 | 86 | } |
| 87 | 87 | $this->methodProperties['PaymentMethod'] = $this->PaymentMethod; |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | |
| 106 | 106 | public function getCargoType() |
| 107 | 107 | { |
| 108 | - if (! $this->CargoType) { |
|
| 108 | + if (!$this->CargoType) { |
|
| 109 | 109 | $this->CargoType = config('novaposhta.cargo_type'); |
| 110 | 110 | } |
| 111 | 111 | $this->methodProperties['CargoType'] = $this->CargoType; |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | |
| 147 | 147 | public function getSeatsAmount() |
| 148 | 148 | { |
| 149 | - if (! $this->SeatsAmount) { |
|
| 149 | + if (!$this->SeatsAmount) { |
|
| 150 | 150 | $this->SeatsAmount = config('novaposhta.seats_amount'); |
| 151 | 151 | } |
| 152 | 152 | $this->methodProperties['SeatsAmount'] = $this->SeatsAmount; |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | |
| 170 | 170 | public function getCost() |
| 171 | 171 | { |
| 172 | - if (! $this->Cost) { |
|
| 172 | + if (!$this->Cost) { |
|
| 173 | 173 | $this->Cost = config('novaposhta.cost'); |
| 174 | 174 | } |
| 175 | 175 | $this->methodProperties['Cost'] = $this->Cost; |
@@ -234,10 +234,10 @@ discard block |
||
| 234 | 234 | */ |
| 235 | 235 | public function setBackwardDeliveryData($RedeliveryString, $PayerType = null, $CargoType = null) |
| 236 | 236 | { |
| 237 | - if (! $PayerType) { |
|
| 237 | + if (!$PayerType) { |
|
| 238 | 238 | $PayerType = config('novaposhta.back_delivery_payer_type'); |
| 239 | 239 | } |
| 240 | - if (! $CargoType) { |
|
| 240 | + if (!$CargoType) { |
|
| 241 | 241 | $CargoType = config('novaposhta.back_delivery_cargo_type'); |
| 242 | 242 | } |
| 243 | 243 | $this->BackwardDeliveryData = [ |
@@ -31,19 +31,19 @@ |
||
| 31 | 31 | public function getSender() |
| 32 | 32 | { |
| 33 | 33 | //конструктор нельзя, потому как трейт |
| 34 | - if (! $this->Sender) { |
|
| 34 | + if (!$this->Sender) { |
|
| 35 | 35 | $this->Sender = config('novaposhta.sender'); |
| 36 | 36 | } |
| 37 | - if (! $this->CitySender) { |
|
| 37 | + if (!$this->CitySender) { |
|
| 38 | 38 | $this->CitySender = config('novaposhta.sender'); |
| 39 | 39 | } |
| 40 | - if (! $this->SenderAddress) { |
|
| 40 | + if (!$this->SenderAddress) { |
|
| 41 | 41 | $this->SenderAddress = config('novaposhta.sender_address'); |
| 42 | 42 | } |
| 43 | - if (! $this->ContactSender) { |
|
| 43 | + if (!$this->ContactSender) { |
|
| 44 | 44 | $this->ContactSender = config('novaposhta.contact_sender'); |
| 45 | 45 | } |
| 46 | - if (! $this->SendersPhone) { |
|
| 46 | + if (!$this->SendersPhone) { |
|
| 47 | 47 | $this->SendersPhone = config('novaposhta.senders_phone'); |
| 48 | 48 | } |
| 49 | 49 | |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | |
| 35 | 35 | public function getOptionsSeat() |
| 36 | 36 | { |
| 37 | - if (! $this->OptionsSeat) { |
|
| 37 | + if (!$this->OptionsSeat) { |
|
| 38 | 38 | $this->OptionsSeat[] = config('novaposhta.options_seat')[10]; |
| 39 | 39 | } |
| 40 | 40 | $this->methodProperties['OptionsSeat'] = $this->OptionsSeat; |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | |
| 60 | 60 | public function getWeight() |
| 61 | 61 | { |
| 62 | - if (! $this->Weight) { |
|
| 62 | + if (!$this->Weight) { |
|
| 63 | 63 | $this->Weight = config('novaposhta.weight'); |
| 64 | 64 | } |
| 65 | 65 | $this->methodProperties['Weight'] = $this->Weight; |
@@ -49,11 +49,11 @@ discard block |
||
| 49 | 49 | */ |
| 50 | 50 | public function getDateTime() |
| 51 | 51 | { |
| 52 | - if ($this->dateTime && (! $this->dateTimeFrom || ! $this->dateTimeTo)) { |
|
| 52 | + if ($this->dateTime && (!$this->dateTimeFrom || !$this->dateTimeTo)) { |
|
| 53 | 53 | $this->methodProperties['DateTime'] = $this->dateTime; |
| 54 | 54 | } |
| 55 | 55 | |
| 56 | - if (! $this->dateTime) { |
|
| 56 | + if (!$this->dateTime) { |
|
| 57 | 57 | $this->dateTime = Carbon::now()->format($this->format); |
| 58 | 58 | $this->methodProperties['DateTime'] = $this->dateTime; |
| 59 | 59 | } |
@@ -67,10 +67,10 @@ discard block |
||
| 67 | 67 | public function getDateTimeFromTo() |
| 68 | 68 | { |
| 69 | 69 | if ($this->dateTimeFrom || $this->dateTimeTo) { |
| 70 | - if (! $this->dateTimeTo) { |
|
| 70 | + if (!$this->dateTimeTo) { |
|
| 71 | 71 | $this->dateTimeTo = Carbon::now()->format($this->format); |
| 72 | 72 | } |
| 73 | - if (! $this->dateTimeFrom) { |
|
| 73 | + if (!$this->dateTimeFrom) { |
|
| 74 | 74 | $this->dateTimeFrom = $this->dateTimeTo; |
| 75 | 75 | } |
| 76 | 76 | |