diff --git a/backend/controllers/WarehouseController.php b/backend/controllers/WarehouseController.php index b0a1cc6..f3faa4f 100644 --- a/backend/controllers/WarehouseController.php +++ b/backend/controllers/WarehouseController.php @@ -8,7 +8,7 @@ use backend\models\WarehouseSearch; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; -use yii\base\Object; +use yii\base\BaseObject; /** * WarehouseController implements the CRUD actions for Warehouse model. diff --git a/backend/models/TransferLaterSearch.php b/backend/models/TransferLaterSearch.php index 8eae458..e5cf0a2 100644 --- a/backend/models/TransferLaterSearch.php +++ b/backend/models/TransferLaterSearch.php @@ -7,7 +7,7 @@ use yii\base\Model; use yii\data\ActiveDataProvider; use common\models\Transfer; use yii\db\Expression; -use yii\base\Object; +use yii\base\BaseObject; use yii\db\Query; use yii\helpers\ArrayHelper; use common\components\Helper; diff --git a/backend/models/TransferSaleSearch.php b/backend/models/TransferSaleSearch.php index a63f885..01cf7a9 100644 --- a/backend/models/TransferSaleSearch.php +++ b/backend/models/TransferSaleSearch.php @@ -6,7 +6,7 @@ use Yii; use yii\base\Model; use yii\data\ActiveDataProvider; use common\models\Transfer; -use yii\base\Object; +use yii\base\BaseObject; use yii\db\Query; use yii\db\Expression; use common\models\Account; diff --git a/backend/models/TransferSummarySearch.php b/backend/models/TransferSummarySearch.php index e8ed64b..3be5538 100644 --- a/backend/models/TransferSummarySearch.php +++ b/backend/models/TransferSummarySearch.php @@ -7,7 +7,7 @@ use yii\base\Model; use yii\data\ActiveDataProvider; use common\models\Transfer; use yii\db\Expression; -use yii\base\Object; +use yii\base\BaseObject; use yii\db\Query; use yii\helpers\ArrayHelper; use common\models\Account; diff --git a/backend/views/transfer/index.php b/backend/views/transfer/index.php index 8b699d3..79dfbaa 100644 --- a/backend/views/transfer/index.php +++ b/backend/views/transfer/index.php @@ -4,7 +4,7 @@ use yii\helpers\Html; use yii\grid\GridView; use yii\widgets\DetailView; use yii\base\Widget; -use yii\base\Object; +use yii\base\BaseObject; use yii\data\ArrayDataProvider; use common\components\AccountStatisticWidget; use common\components\DataProviderTotal; diff --git a/backend/views/transfer/payment_later.php b/backend/views/transfer/payment_later.php index 3a53d06..3af7e37 100644 --- a/backend/views/transfer/payment_later.php +++ b/backend/views/transfer/payment_later.php @@ -4,7 +4,7 @@ use yii\helpers\Html; use yii\grid\GridView; use yii\widgets\DetailView; use yii\base\Widget; -use yii\base\Object; +use yii\base\BaseObject; use yii\data\ArrayDataProvider; use common\components\AccountStatisticWidget; use common\components\DataProviderTotal; diff --git a/common/components/DetStaDBSave.php b/common/components/DetStaDBSave.php index d914e7c..d962a7f 100644 --- a/common/components/DetStaDBSave.php +++ b/common/components/DetStaDBSave.php @@ -4,7 +4,7 @@ namespace common\components; use common\models\Transfer; -use yii\base\Object; +use yii\base\BaseObject; use common\models\MessageDetstaLab; use common\models\MessageDetstaTetel; use common\models\MessageDetsta; @@ -12,13 +12,13 @@ use common\models\MessageDetstaFej; use common\models\TicketInstallmentRequest; /** * Detstat üzenet mentése adatbázisba - * + * * @property common\models\Ugiro $koteg * @property common\models\giro\GiroDETSTA $giroDETSTA */ -class DetStaDBSave extends Object +class DetStaDBSave extends BaseObject { - + /** * giro köteg * */ @@ -35,21 +35,21 @@ class DetStaDBSave extends Object public $messageFej; /**messagedetsta lab*/ public $messageLab; - + public $path; - + /**messagedetsta tetelek*/ public $messageTetelek = []; - - + + public function run(){ $this->saveMessageDetsta(); $this->saveMessageDetstaFej( ); $this->saveMessageDetstaLab(); $this->saveMessageDetstaTetelek(); - + } - + /** * * */ @@ -60,17 +60,17 @@ class DetStaDBSave extends Object if ( isset( $this->koteg ) ){ $this->message->id_ugiro = $this->koteg->id_ugiro; } - + if ( !$this->message->save() ){ \Yii::error("Nem sikerült menteni a detsta üzenet fájlt"); throw new \Exception("Nem sikerült menteni a detsta üzenet fájtl"); } \Yii::info("detsta üzenet mentve"); - - - + + + } - + protected function readDate($date){ $date = trim($date); if ( empty($date)) @@ -81,7 +81,7 @@ class DetStaDBSave extends Object } return $dtime->format('Y-m-d'); } - + /** * * */ @@ -89,9 +89,9 @@ class DetStaDBSave extends Object $this->messageFej = new MessageDetstaFej(); $fej = $this->giroDETSTA->fej; /** @var common\components\giro\GiroDETSTAFej $fej */ - + $dtime = \DateTime::createFromFormat("yyyyMMdd",""); - + $this->messageFej->id_message = $this->message->id_message; $this->messageFej->record_tipus = $fej->recordTipus; $this->messageFej->uzenet_tipus = $fej->uzenetTipus; @@ -108,7 +108,7 @@ class DetStaDBSave extends Object } \Yii::info("detsta fej üzenet mentve"); } - + protected function saveMessageDetstaLab( ){ $this->messageLab = new MessageDetstaLab(); $lab = $this->giroDETSTA->lab; @@ -120,25 +120,25 @@ class DetStaDBSave extends Object $this->messageLab->visszautasitott_tetelek_osszerteke = $lab->visszautasitottTetelekSzama; $this->messageLab->megnemvalaszolt_tetelek_szama = $lab->megNemValaszoltTetelekSzama; $this->messageLab->megnemvalaszolt_tetelek_osszerteke = $lab->megNemValaszoltTetelekOsszerteke; - + if ( !$this->messageLab->save(false)){ \Yii::error("Nem sikerült menteni a detsta üzenet lab fájlt"); throw new \Exception("Nem sikerült menteni a detsta üzenet lab fájlt"); } \Yii::info("detsta lab üzenet mentve"); } - + protected function saveMessageDetstaTetelek( ){ $tetelek = $this->giroDETSTA->tetelek; foreach ($tetelek as $tetel){ $this->saveMessageDetstaTetel($tetel); } - + } protected function saveMessageDetstaTetel($tetel ){ $mt = new MessageDetstaTetel(); $mt->id_message = $this->message->id_message; - + $mt->record_tipus = $tetel->recordTipus ; $mt->tetel_sorszam= $tetel->tetelSorszam ; $mt->osszeg= $tetel->osszeg ; @@ -149,22 +149,22 @@ class DetStaDBSave extends Object $mt->valasz_hivatkozasi_kod= $tetel->valaszHivatkozasiKod ; $mt->eredeti_hivatkozasi_kod= $tetel->eredetiHivatkozasiKod ; $mt->ugyfel_azonosito= $tetel->ugyfelAzonosito ; - + $request = $this->readRequest($mt->tetel_sorszam); - + if ( isset($request) ){ $mt->id_ticket_installment_request = $request->id_ticket_installment_request; } - + if ( !$mt->save(false)){ \Yii::error("Nem sikerült menteni a detsta üzenet tetelt"); throw new \Exception("Nem sikerült menteni a detsta üzenet tetelt"); } \Yii::info("detsta tetel üzenet mentve"); $this->messageTetelek[] = $mt; - + } - + protected function readRequest($tetel_sorszam){ $query = TicketInstallmentRequest::find(); $query->innerJoin("ugiro_request_assignment","ugiro_request_assignment.id_request = ticket_installment_request.id_ticket_installment_request"); @@ -173,6 +173,6 @@ class DetStaDBSave extends Object $query->andWhere(['ticket_installment_request.number' => $tetel_sorszam]); return $query->one(); } - - -} \ No newline at end of file + + +} diff --git a/common/components/DetStatProcessor.php b/common/components/DetStatProcessor.php index 22771d7..bf89695 100644 --- a/common/components/DetStatProcessor.php +++ b/common/components/DetStatProcessor.php @@ -2,7 +2,7 @@ namespace common\components; -use yii\base\Object; +use yii\base\BaseObject; use common\models\Ugiro; use common\components\giro\GiroDETSTA; @@ -14,7 +14,7 @@ use common\components\giro\GiroDETSTA; * @property \common\models\UGiro $koteg * * */ -class DetStatProcessor extends Object{ +class DetStatProcessor extends BaseObject{ /**aktuális koteg, config paraméterként kapju*/ @@ -154,4 +154,4 @@ class DetStatProcessor extends Object{ } -} \ No newline at end of file +} diff --git a/common/components/DetStatTetelProcessor.php b/common/components/DetStatTetelProcessor.php index 4c5e3fa..ab33860 100644 --- a/common/components/DetStatTetelProcessor.php +++ b/common/components/DetStatTetelProcessor.php @@ -3,7 +3,7 @@ namespace common\components; use common\models\Transfer; -use yii\base\Object; +use yii\base\BaseObject; use common\models\TicketInstallmentRequest; use common\components\giro\GiroDETSTATetel; use common\models\Account; @@ -19,7 +19,7 @@ use common\models\Contract; * * */ -class DetStatTetelProcessor extends Object { +class DetStatTetelProcessor extends BaseObject { /** * A válasz tétel . Ha nincs megadva, automatikus visszautasítjuk a megbízást * */ @@ -320,4 +320,4 @@ class DetStatTetelProcessor extends Object { public function hasError() { return false; } -} \ No newline at end of file +} diff --git a/common/components/FreeUniqueCardNumberGenerator.php b/common/components/FreeUniqueCardNumberGenerator.php index 882179b..d06f497 100644 --- a/common/components/FreeUniqueCardNumberGenerator.php +++ b/common/components/FreeUniqueCardNumberGenerator.php @@ -4,7 +4,7 @@ namespace common\components; use common\models\Card; -class FreeUniqueCardNumberGenerator extends \yii\base\Object { +class FreeUniqueCardNumberGenerator extends \yii\base\BaseObject { public $count; public $keyset = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'; public $length = 6; @@ -37,4 +37,4 @@ class FreeUniqueCardNumberGenerator extends \yii\base\Object { protected function checkCacheUnique($number) { return array_search ( $number, $this->cache ) === false; } -} \ No newline at end of file +} diff --git a/common/components/ProductInventory.php b/common/components/ProductInventory.php index cca7506..c054ec2 100644 --- a/common/components/ProductInventory.php +++ b/common/components/ProductInventory.php @@ -2,7 +2,7 @@ namespace common\components; -use yii\base\Object; +use yii\base\BaseObject; use yii\db\Query; use common\models\Product; use yii\data\ActiveDataProvider; @@ -14,7 +14,7 @@ use common\models\Transfer; * @property common\models\Account $account a kassza * @property common\models\Product[] $products a termékek * */ -class ProductInventory extends Object{ +class ProductInventory extends BaseObject{ @@ -110,4 +110,4 @@ class ProductInventory extends Object{ } -?> \ No newline at end of file +?> diff --git a/common/components/TicketSale.php b/common/components/TicketSale.php index fdf288d..b6b9ae3 100644 --- a/common/components/TicketSale.php +++ b/common/components/TicketSale.php @@ -1 +1 @@ -readMoney(); $this->readStartDate(); $this->readEndDate(); $this->mkTicket(); $this->mkTransfer(); $this->addToCustomerCart(); } /** * @throws \Exception */ protected function mkTicket( ) { $this->ticket = new Ticket (); $this->ticket->id_user = \Yii::$app->user->id; $this->ticket->id_ticket_type = $this->ticketType->id_ticket_type; // save to contract $this->ticket->id_account = $this->account->id_account; $this->ticket->id_discount = isset($this->discount) ? $this->discount->id_discount : null; // contract.id_discount $this->ticket->start = $this->start; $this->ticket->end = $this->end; $this->ticket->max_reservation_count = $this->ticketType->max_reservation_count; $this->ticket->max_usage_count = $this->ticketType->max_usage_count; $this->ticket->usage_count = 0; $this->ticket->reservation_count = 0; $this->ticket->status = $this->transferStatus == Transfer::STATUS_PAID ? Ticket::STATUS_ACTIVE : Ticket::STATUS_INACTIVE ; $this->ticket->price_brutto = $this->money; $this->ticket->id_card = $this->card->id_card; if ( isset( $this->ticketInstallmentRequest ) ){ $this->ticket->part = $this->ticketInstallmentRequest->priority; } if (isset($this->contract)){ $this->ticket->id_contract = $this->contract->id_contract; } if ( !$this->ticket->save ( false ) ){ \Yii::error("Nem sikerült menteni a bérletet!"); throw new \Exception("Bérlet mentése nem sikerült"); } \Yii::info("Bérlet elmentve: id=" . $this->ticket->id_ticket); } /** * @throws \Exception */ protected function mkTransfer( ) { $this->transfer = new Transfer (); $this->transfer->status = $this->transferStatus; $this->transfer->type = Transfer::TYPE_TICKET; $this->transfer->direction = Transfer::DIRECTION_IN; $this->transfer->id_object = $this->ticket->id_ticket; $this->transfer->item_price = $this->ticketType->price_brutto; $this->transfer->money = $this->money; $this->transfer->id_account = $this->account->id_account; $this->transfer->count = 1; if ($this->transferStatus == Transfer::STATUS_PAID) { $this->transfer->paid_at = date ( 'Y-m-d H:i:s' ); $this->transfer->paid_by = \Yii::$app->user->id; } $this->transfer->payment_method = $this->paymentMethod; $this->transfer->comment = ""; if ( isset($this->ticketInstallmentRequest)){ $this->transfer->comment = "Csoportos megbízással"; } $this->transfer->id_user = \Yii::$app->user->id; $this->transfer->id_customer = $this->customer->id_customer; if ( !$this->transfer->save (false) ){ \Yii::error("Nem sikerült menteni a tranzakciót!"); throw new \Exception("Tranzakció mentése nem sikerült"); } \Yii::info("tranzakció elmentve: id=" . $this->transfer->id_transfer); } protected function addToCustomerCart( ) { if ( isset( $this->customer ) ){ if ( $this->transferStatus == Transfer::STATUS_NOT_PAID ){ $cartItem = new ShoppingCart(); $cartItem->id_customer = $this->customer->id_customer; $cartItem->id_transfer = $this->transfer->id_transfer; $cartItem->save(false); } } } protected function readMoney(){ if ( !isset($this->money)){ $this->money = $this->ticketType->price_brutto; if (isset($this->discount)){ $this->money = Discount::applyDiscount($this->money, $this->discount); } if ( isset($this->ticketInstallmentRequest)){ $this->money = $this->ticketInstallmentRequest->money; } } } protected function readStartDate(){ if ( !isset($this->start)){ $this->start = Helper::getDateString(); if ( isset($this->ticketInstallmentRequest)){ $this->start = $this->ticketInstallmentRequest->request_target_time_at; } } } protected function readEndDate(){ if ( !isset($this->end)){ $unit = "month"; if ( $this->ticketType->time_unit_type == TicketType::TIME_UNIT_DAY ) { $unit = "day"; } $count = $this->ticketType->time_unit_count; $this->end = date( 'Y-m-d', strtotime( $this->start . " +$count $unit -1 day")); if ( isset($this->ticketInstallmentRequest)){ $this->end = date( 'Y-m-d', strtotime( $this->ticketInstallmentRequest->request_target_time_at . " +1 month -1 day")); } } } } \ No newline at end of file +readMoney(); $this->readStartDate(); $this->readEndDate(); $this->mkTicket(); $this->mkTransfer(); $this->addToCustomerCart(); } /** * @throws \Exception */ protected function mkTicket( ) { $this->ticket = new Ticket (); $this->ticket->id_user = \Yii::$app->user->id; $this->ticket->id_ticket_type = $this->ticketType->id_ticket_type; // save to contract $this->ticket->id_account = $this->account->id_account; $this->ticket->id_discount = isset($this->discount) ? $this->discount->id_discount : null; // contract.id_discount $this->ticket->start = $this->start; $this->ticket->end = $this->end; $this->ticket->max_reservation_count = $this->ticketType->max_reservation_count; $this->ticket->max_usage_count = $this->ticketType->max_usage_count; $this->ticket->usage_count = 0; $this->ticket->reservation_count = 0; $this->ticket->status = $this->transferStatus == Transfer::STATUS_PAID ? Ticket::STATUS_ACTIVE : Ticket::STATUS_INACTIVE ; $this->ticket->price_brutto = $this->money; $this->ticket->id_card = $this->card->id_card; if ( isset( $this->ticketInstallmentRequest ) ){ $this->ticket->part = $this->ticketInstallmentRequest->priority; } if (isset($this->contract)){ $this->ticket->id_contract = $this->contract->id_contract; } if ( !$this->ticket->save ( false ) ){ \Yii::error("Nem sikerült menteni a bérletet!"); throw new \Exception("Bérlet mentése nem sikerült"); } \Yii::info("Bérlet elmentve: id=" . $this->ticket->id_ticket); } /** * @throws \Exception */ protected function mkTransfer( ) { $this->transfer = new Transfer (); $this->transfer->status = $this->transferStatus; $this->transfer->type = Transfer::TYPE_TICKET; $this->transfer->direction = Transfer::DIRECTION_IN; $this->transfer->id_object = $this->ticket->id_ticket; $this->transfer->item_price = $this->ticketType->price_brutto; $this->transfer->money = $this->money; $this->transfer->id_account = $this->account->id_account; $this->transfer->count = 1; if ($this->transferStatus == Transfer::STATUS_PAID) { $this->transfer->paid_at = date ( 'Y-m-d H:i:s' ); $this->transfer->paid_by = \Yii::$app->user->id; } $this->transfer->payment_method = $this->paymentMethod; $this->transfer->comment = ""; if ( isset($this->ticketInstallmentRequest)){ $this->transfer->comment = "Csoportos megbízással"; } $this->transfer->id_user = \Yii::$app->user->id; $this->transfer->id_customer = $this->customer->id_customer; if ( !$this->transfer->save (false) ){ \Yii::error("Nem sikerült menteni a tranzakciót!"); throw new \Exception("Tranzakció mentése nem sikerült"); } \Yii::info("tranzakció elmentve: id=" . $this->transfer->id_transfer); } protected function addToCustomerCart( ) { if ( isset( $this->customer ) ){ if ( $this->transferStatus == Transfer::STATUS_NOT_PAID ){ $cartItem = new ShoppingCart(); $cartItem->id_customer = $this->customer->id_customer; $cartItem->id_transfer = $this->transfer->id_transfer; $cartItem->save(false); } } } protected function readMoney(){ if ( !isset($this->money)){ $this->money = $this->ticketType->price_brutto; if (isset($this->discount)){ $this->money = Discount::applyDiscount($this->money, $this->discount); } if ( isset($this->ticketInstallmentRequest)){ $this->money = $this->ticketInstallmentRequest->money; } } } protected function readStartDate(){ if ( !isset($this->start)){ $this->start = Helper::getDateString(); if ( isset($this->ticketInstallmentRequest)){ $this->start = $this->ticketInstallmentRequest->request_target_time_at; } } } protected function readEndDate(){ if ( !isset($this->end)){ $unit = "month"; if ( $this->ticketType->time_unit_type == TicketType::TIME_UNIT_DAY ) { $unit = "day"; } $count = $this->ticketType->time_unit_count; $this->end = date( 'Y-m-d', strtotime( $this->start . " +$count $unit -1 day")); if ( isset($this->ticketInstallmentRequest)){ $this->end = date( 'Y-m-d', strtotime( $this->ticketInstallmentRequest->request_target_time_at . " +1 month -1 day")); } } } } \ No newline at end of file diff --git a/common/components/TransferPayout.php b/common/components/TransferPayout.php index fde871e..c1c32da 100644 --- a/common/components/TransferPayout.php +++ b/common/components/TransferPayout.php @@ -11,7 +11,7 @@ use common\models\Ticket; -class TransferPayout extends \yii\base\Object{ +class TransferPayout extends \yii\base\BaseObject{ /**Current user*/ public $idUser = null; @@ -136,4 +136,4 @@ class TransferPayout extends \yii\base\Object{ } -} \ No newline at end of file +} diff --git a/common/components/accountstate/AccountStateMail.php b/common/components/accountstate/AccountStateMail.php index 10cafed..d3408f4 100644 --- a/common/components/accountstate/AccountStateMail.php +++ b/common/components/accountstate/AccountStateMail.php @@ -2,34 +2,34 @@ namespace common\components\accountstate; -use yii\base\Object; use common\models\User; use common\models\Account; use common\models\AccountState; use common\components\DailyListing; +use yii\base\BaseObject; /** * @property common\models\AccountState $model * */ -class AccountStateMail extends Object { - - +class AccountStateMail extends BaseObject { + + public $controller; public $model; public $user; public $account; public $message; public $details; - + public function init(){ - + $this->user = User::findOne($this->model->id_user); $this->account = Account::findOne($this->model->id_account); - + $this->details = null; - + if ($this->model ->isTypeClose ()) { - + $prev; if ($this->model->type == AccountState::TYPE_CLOSE) { if (isset ( $this->model->prev_state )) { @@ -41,28 +41,28 @@ class AccountStateMail extends Object { } $this->details = new DailyListing(); $this->details->loadAccountState ( $this->model ); - + $this->details->readModeAccountState(); - + // $this->details->readTotalEasy (); // $this->details->readTotalDetailed (); // $this->details->readTotalMedium (); } } - + public function sednMail(){ - + $subject = $this->model->isTypeOpen() ? "Kassza nyitás " : "Kassza zárás"; $subject .= " - " . $this->user->username ." - ". $this->account->name; - + $this->message = \Yii::$app->mailer->compose('account_state', [ 'model' => $this->model, 'details' => $this->details ]); - + $this->attachPdf(); - + try{ $this->message->setFrom(\Yii::$app->params['infoEmail']) ->setTo( \Yii::$app->params['notify_mail'] ) @@ -71,21 +71,21 @@ class AccountStateMail extends Object { }catch (\Exception $e){ \Yii::error("Nem sikerült elküldeni a kassza müvelet emailt"); } - + } - - + + protected function attachPdf(){ $mpdf=new \mPDF('utf-8', 'A4-L'); $mpdf->useSubstitutions=false; $mpdf->simpleTables = true; $mpdf->SetHeader( \Yii::$app->params[ "company_name" ] . " - Létrehozva: " .$user->username . ", ".\Yii::$app->formatter->asDatetime(time()) ); $mpdf->setFooter('{PAGENO} / {nb}'); - + $stylesheet = file_get_contents( \Yii::getAlias('@vendor'.'/bower/bootstrap/dist/css/bootstrap.css')); // external css $mpdf->WriteHTML($stylesheet,1); - - + + $mpdf->WriteHTML($this->controller->renderPartial("@common/views/account-state/account_state_pdf", [ 'model' => $this->model, 'details' => $this->details @@ -94,11 +94,11 @@ class AccountStateMail extends Object { $dt= "_letrehozva_".date("Ymd_His"). "_" . $this->user->username; $fn= $type .$dt.".pdf"; $content = $mpdf->Output($fn, 'S'); - + $this->message->attachContent($content, ['fileName' => $fn, 'contentType' => 'application/pdf']); } - - - - -} \ No newline at end of file + + + + +} diff --git a/common/models/MoneyMovement.php b/common/models/MoneyMovement.php index 91103e7..a299734 100644 --- a/common/models/MoneyMovement.php +++ b/common/models/MoneyMovement.php @@ -7,7 +7,7 @@ use yii\helpers\ArrayHelper; use yii\behaviors\TimestampBehavior; use common\components\AccountAwareBehavior; use common\components\UserAwareBehavior; -use yii\base\Object; +use yii\base\BaseObject; use common\models\Transfer; /** diff --git a/common/models/TransferSaleSearch.php b/common/models/TransferSaleSearch.php index 10921e9..4bf2219 100644 --- a/common/models/TransferSaleSearch.php +++ b/common/models/TransferSaleSearch.php @@ -6,7 +6,7 @@ use Yii; use yii\base\Model; use yii\data\ActiveDataProvider; use common\models\Transfer; -use yii\base\Object; +use yii\base\BaseObject; use yii\db\Query; use yii\db\Expression; use common\models\Account; diff --git a/common/models/TransferTicketSearch.php b/common/models/TransferTicketSearch.php index 71c493f..462e710 100644 --- a/common/models/TransferTicketSearch.php +++ b/common/models/TransferTicketSearch.php @@ -6,7 +6,7 @@ use Yii; use yii\base\Model; use yii\data\ActiveDataProvider; use common\models\Transfer; -use yii\base\Object; +use yii\base\BaseObject; use yii\db\Query; use yii\db\Expression; use common\models\Account; diff --git a/frontend/components/AccountStateBanknoteCountWidget.php b/frontend/components/AccountStateBanknoteCountWidget.php index e248fc0..48ec52c 100644 --- a/frontend/components/AccountStateBanknoteCountWidget.php +++ b/frontend/components/AccountStateBanknoteCountWidget.php @@ -6,7 +6,7 @@ use common\models\AccountState; use yii\helpers\Html; use yii\widgets\DetailView; use yii\grid\GridView; -use yii\base\Object; +use yii\base\BaseObject; use yii\data\ArrayDataProvider; use yii\helpers\Url; use common\components\total\TotalDifferenceWidget; @@ -226,4 +226,4 @@ class AccountStateBanknoteCountWidget extends Widget{ -} \ No newline at end of file +} diff --git a/frontend/components/FrontendController.php b/frontend/components/FrontendController.php index 02a148d..eac502c 100644 --- a/frontend/components/FrontendController.php +++ b/frontend/components/FrontendController.php @@ -8,7 +8,7 @@ use common\models\MoneyMovement; use yii\db\Query; use common\models\AccountState; use yii\web\Controller; -use yii\base\Object; +use yii\base\BaseObject; use frontend\models\ReceptionForm; use common\models\UserSoldItem; use common\models\ShoppingCart; @@ -59,4 +59,4 @@ class FrontendController extends Controller{ return true; } -} \ No newline at end of file +} diff --git a/frontend/controllers/CardController.php b/frontend/controllers/CardController.php index 6eab957..5e70e96 100644 --- a/frontend/controllers/CardController.php +++ b/frontend/controllers/CardController.php @@ -8,7 +8,7 @@ use backend\models\CardSearch; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; -use yii\base\Object; +use yii\base\BaseObject; use yii\db\Query; use common\models\Customer; use yii\helpers\Json; diff --git a/frontend/controllers/CityController.php b/frontend/controllers/CityController.php index fa258a7..5799ab0 100644 --- a/frontend/controllers/CityController.php +++ b/frontend/controllers/CityController.php @@ -8,7 +8,7 @@ use backend\models\CitySearch; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; -use yii\base\Object; +use yii\base\BaseObject; use yii\db\Query; use yii\helpers\Json; diff --git a/frontend/controllers/KeyController.php b/frontend/controllers/KeyController.php index eb7ddc1..d6d97be 100644 --- a/frontend/controllers/KeyController.php +++ b/frontend/controllers/KeyController.php @@ -7,7 +7,7 @@ use common\models\Key; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; -use yii\base\Object; +use yii\base\BaseObject; use yii\db\Query; use yii\helpers\Json; use frontend\models\KeySearch; diff --git a/frontend/controllers/MobileDeviceController.php b/frontend/controllers/MobileDeviceController.php index 6972ac8..085e83d 100644 --- a/frontend/controllers/MobileDeviceController.php +++ b/frontend/controllers/MobileDeviceController.php @@ -12,7 +12,7 @@ use backend\models\CitySearch; use yii\web\Controller; use yii\web\NotFoundHttpException; use yii\filters\VerbFilter; -use yii\base\Object; +use yii\base\BaseObject; use yii\db\Query; use yii\helpers\Json; diff --git a/frontend/controllers/ProductController.php b/frontend/controllers/ProductController.php index 56e6c21..6ce30be 100644 --- a/frontend/controllers/ProductController.php +++ b/frontend/controllers/ProductController.php @@ -13,7 +13,7 @@ use frontend\models\ProductLookupForm; use common\models\Card; use common\models\Customer; use yii\base\DynamicModel; -use yii\base\Object; +use yii\base\BaseObject; use common\models\Currency; use common\models\Account; use common\models\Discount; diff --git a/frontend/models/CreateAccountSelectForm.php b/frontend/models/CreateAccountSelectForm.php index f141273..b79af1f 100644 --- a/frontend/models/CreateAccountSelectForm.php +++ b/frontend/models/CreateAccountSelectForm.php @@ -8,7 +8,7 @@ use common\models\Card; use common\models\Customer; use common\models\Product; use common\models\Transfer; -use yii\base\Object; +use yii\base\BaseObject; use common\models\Account; use common\models\Discount; use common\models\Currency; diff --git a/frontend/models/ProductSaleForm.php b/frontend/models/ProductSaleForm.php index 02dfddc..2fb4524 100644 --- a/frontend/models/ProductSaleForm.php +++ b/frontend/models/ProductSaleForm.php @@ -8,7 +8,7 @@ use common\models\Card; use common\models\Customer; use common\models\Product; use common\models\Transfer; -use yii\base\Object; +use yii\base\BaseObject; use common\models\Account; use common\models\Discount; use common\models\Currency; diff --git a/frontend/models/TransferListSearch.php b/frontend/models/TransferListSearch.php index 7ec5f80..9dfc21e 100644 --- a/frontend/models/TransferListSearch.php +++ b/frontend/models/TransferListSearch.php @@ -6,7 +6,7 @@ use Yii; use yii\base\Model; use yii\data\ActiveDataProvider; use common\models\Transfer; -use yii\base\Object; +use yii\base\BaseObject; use yii\db\Query; use yii\db\Expression; use common\models\Account; diff --git a/frontend/views/common/_card_number_tickets.php b/frontend/views/common/_card_number_tickets.php index 3061142..fcf81b9 100644 --- a/frontend/views/common/_card_number_tickets.php +++ b/frontend/views/common/_card_number_tickets.php @@ -1,5 +1,5 @@