[ERP-393] start testing 2

diff --git a/erp24/actions/orders/DeliveryAction.php b/erp24/actions/orders/DeliveryAction.php
index 4a8e4ea7f1c87aa59472b8f80316abdceed2b97f..d3d771210537f7c73bfdb889e610b5522b5a5cfb 100644 (file)
--- a/erp24/actions/orders/DeliveryAction.php
+++ b/erp24/actions/orders/DeliveryAction.php
@@ -2,6 +2,7 @@
 
 namespace yii_app\actions\orders;
 
+use GuzzleHttp\Client;
 use Yii;
 use yii\base\Action;
 use yii\helpers\ArrayHelper;
@@ -20,7 +21,16 @@ class DeliveryAction extends Action
     public function run() {
 
         $action = Yii::$app->request->get('action');
-        if ($action == 'amoUpdateDate') { $TODO = 2; return "TODO 2"; }
+        if ($action == 'amoUpdateDate') {
+            $date = Yii::$app->request->get('date');
+            $host = 'https://api1.' . $_SERVER['HTTP_HOST'] . '/cron/amo142?date1=' . $date . '&date2=' . $date . '&status_id=142&key=getJH6GFi4tpU84YVPW9M__Xe_eQ24baWRFGl9ance&token_cloud=iC04295J9HyD2H3GJF3btky&grant_type=refresh_token&secret_phrase=VJJVkt467ltuXU__356XEtS';
+            $client = new Client();
+            try {
+                return $client->get($host)->getBody()->getContents();
+            } catch (\Exception $ex) {
+                return $ex->getMessage();
+            }
+        }
 
         if (Yii::$app->request->get('umoup')) { $TODO = 1; }
 
@@ -66,7 +76,7 @@ class DeliveryAction extends Action
         }
 
         $products1cs = Products1c::find()->alias('p1c')->select(['p1c.id'])
-            ->rightJoin('products_class pc', 'p1c.parent_id = pc.category_id and pc.tip="services"')->all();
+            ->rightJoin('products_class pc', "p1c.parent_id = pc.category_id and pc.tip='services'")->all();
 
         $services = [];
         foreach($products1cs as $products1c) {
@@ -84,7 +94,7 @@ class DeliveryAction extends Action
 
         $stores_arr = ArrayHelper::map(Products1c::find()->select(['id', 'name'])->where(['tip' => 'city_store'])->all(), 'id', 'name');
 
-        $cityStores = CityStore::find()->select(['id', 'name', 'access_amo'])->all();
+        $cityStores = CityStore::find()->select(['id', 'name', 'adress_amo'])->all();
         $storesNameArr = [];
         foreach($cityStores as $cityStore) {
             $store_arr[$cityStore->id] = $cityStore->name;
@@ -127,7 +137,7 @@ class DeliveryAction extends Action
             $create_check_arr[$createCheck2->order_id][] = $createCheck2;
         }
 
-        $ordersAmoQuery = OrdersAmo::find()->where(['<=', 'delivery_date', date('Y-m-d H:i:s', time())]);
+        $ordersAmoQuery = OrdersAmo::find()->select(['*', "TO_CHAR(delivery_date, 'DD.MM.YYYY') as dated"])->where(['<=', 'delivery_date', date('Y-m-d H:i:s', time())]);
         if (!empty($lid_id)) {
             $ordersAmoQuery->andWhere(['id' => $lid_id]);
         } elseif (!empty($amo_id)) {

diff --git a/erp24/views/orders/delivery.php b/erp24/views/orders/delivery.php
index f5ad520336273be23daa9a16c9c8978c17416f67..058801cdff2e5a75c8c8d1503c926b102de22b03 100644 (file)
--- a/erp24/views/orders/delivery.php
+++ b/erp24/views/orders/delivery.php
@@ -51,7 +51,7 @@ $this->registerCss('
     <?php $form = ActiveForm::begin([
         "action" => "/orders/delivery",
         "method" => "GET",
-        "target" => "_blank",
+        "options" => ["target" => "_blank"],
     ]) ?>
     <?= Html::hiddenInput('action', 'amoUpdateDate') ?>
     <?= Html::textInput('date', date('Y-m-d'), ['required' => true, 'type' => 'date']) ?>