hotfix

leon-mbs · Dec 27, 2024 · 01c82f3 · 01c82f3
1 parent f6a9709
commit 01c82f3
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 17 deletions.
diff --git a/www/app/modules/np/helper.php b/www/app/modules/np/helper.php
@@ -62,14 +62,14 @@ class Helper
 
 
 
-    public function __construct() {
+    public function __construct($throwErrors = false) {
 
 
         $modules = \App\System::getOptions("modules");
 
        // parent::__construct($modules['npapikey']);
 
-      //  $this->throwErrors = $throwErrors;
+        $this->throwErrors = $throwErrors;
         $this
             ->setKey($modules['npapikey'])
          //   ->setLanguage($language)
@@ -230,6 +230,8 @@ private function request($model, $method, $params = null)
             ? self::API_URI.'/xml/'
             : self::API_URI.'/json/';
 
+     //   $url = "https://api-cdn.novaposhta.ua/api-warehouses/api2/generated-cache/warehouses/warehouses.json";
+
         $data = array(
             'apiKey' => $this->key,
             'modelName' => $model,
@@ -253,6 +255,19 @@ private function request($model, $method, $params = null)
                 curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
                 curl_setopt($ch, CURLOPT_POSTFIELDS, $post);
                 $result = curl_exec($ch);
+
+                if (curl_errno($ch) > 0) {
+                    $msg = "sign server error: ".curl_error($ch);
+                    $msg = str_replace("'", "\"", $msg) ;
+                    $result = array('success' => false, 'errors' => $msg);
+                }                
+                $status_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+                if ($status_code !== 200) {
+
+
+                    $result = array('success' => false, 'errors' => "Код  ".$status_code);
+
+                }                
                 curl_close($ch);
 
         } else {
@@ -1211,9 +1226,6 @@ public function getPointListCache($cityref,$pm=false) {
     //обновление  кеща  списков
     public function updatetCache() {
 
-        @unlink(_ROOT . "upload/arealist.dat");
-        @unlink(_ROOT . "upload/citylist.dat");
-        @unlink(_ROOT . "upload/pointlist.dat");
 
         @mkdir(_ROOT . "upload") ;
 
@@ -1241,7 +1253,8 @@ public function updatetCache() {
         }
 
         $d = serialize($areas);
-
+        @unlink(_ROOT . "upload/arealist.dat");
+
         file_put_contents(_ROOT . "upload/arealist.dat", $d);
         unset($d);
 
@@ -1255,12 +1268,13 @@ public function updatetCache() {
         }
 
         $d = serialize($cities);
-
+        @unlink(_ROOT . "upload/citylist.dat");
+
         file_put_contents(_ROOT . "upload/citylist.dat", $d);
         unset($tmplist);
         unset($cities);
         unset($d);
-        gc_collect_cycles() ;
+      //  gc_collect_cycles() ;
 
         $wlist = array();
         $tmplist = $this->getWarehouses('');
@@ -1269,7 +1283,8 @@ public function updatetCache() {
             $wlist[] = array('Ref' => $a['Ref'], 'City' => $a['CityRef'], 'Description' => trim($a['Description']) );
         }
         unset($tmplist) ;
-        gc_collect_cycles() ;
+     //   gc_collect_cycles() ;
+        @unlink(_ROOT . "upload/pointlist.dat");
 
         $d = serialize($wlist);
         file_put_contents(_ROOT . "upload/pointlist.dat", $d);

diff --git a/www/app/modules/np/options.php b/www/app/modules/np/options.php
@@ -147,7 +147,7 @@ public function savecacheOnClick($sender) {
 
         try {
 
-           $api = new Helper();
+           $api = new Helper(true);
 
            $ret = $api->updatetCache()  ;
 
@@ -158,15 +158,17 @@ public function savecacheOnClick($sender) {
            if(strlen($ret['warn'] ??'')>0 ) {
                $this->setWarn($ret['warn']);                           
            }
-
+           $this->setSuccess('Збережено'); 
+           $this->updateData();           
+
         } catch(\Exception $ee) {
             $msg = $ee->getMessage();
             $this->setError($msg);            
         }
 
-        $this->updateData();
+
 
-        $this->setSuccess('Збережено');
+
     }
 
     public function gabListOnRow(  $row) {

diff --git a/www/app/pages/base.php b/www/app/pages/base.php
@@ -364,10 +364,12 @@ public function beforeRender() {
         $this->_tvars['alerterror'] = "";
         if (strlen(System::getErrorMsgTopPage() ?? '') > 0) {
             $this->_tvars['alerterror'] = System::getErrorMsgTopPage();
-
             $this->goAnkor('topankor');
-
-
+        }       
+        $this->_tvars['alertinfo'] = "";
+        if (strlen(System::getInfoMsgTopPage() ?? '') > 0) {
+            $this->_tvars['alertinfo'] = System::getInfoMsgTopPage();
+            $this->goAnkor('topankor');
         }       
     }
 
@@ -390,6 +392,7 @@ protected function afterRender() {
 
         $this->setError('');
         $this->setErrorTopPage('');
+        $this->setInfoTopPage('');
 
         $this->setSuccess('');
         $this->setInfo('');

diff --git a/www/app/pages/doc/goodsissue.php b/www/app/pages/doc/goodsissue.php
@@ -191,7 +191,7 @@ public function __construct($docid = 0, $basedocid = 0) {
                         $order = $basedoc->cast();
 
                         if($order->getNotSendedItem() == 0){
-                           . $this->setWarn('Позиції по  цьому замовленню вже відправлені') ;
+                           $this->setWarn('Позиції по  цьому замовленню вже відправлені') ;
                         }
 
                         $this->docform->total->setText(H::fa($order->amount));

diff --git a/www/templates/pages/base.html b/www/templates/pages/base.html
@@ -1102,6 +1102,12 @@
                             </div>
                             {{/alerterror}}
 
+                            {{#alertinfo}}
+                            <div class="alert alert-info" role="alert">
+                                {{{alertinfo}}}
+                            </div>
+                            {{/alertinfo}}
+
                         </div>
                     </div>
                     <div class="row">