changed popular items in pageController itemAction, and added links to addresses

Administrator
1 parent 29d4a3f1
Showing 4 changed files with 42 additions and 33 deletions Show diff stats
src/app/frontend/controllers/MenuController.php
src/lib/novaposhta.php
www/js/main.js
www/js/main_ru.js
@@ -32,10 +32,11 @@ class MenuController extends \controllers\ControllerBase
 		$err            = 0;
 		$cities_ = $this->novaposhta->city();
-		
-		foreach( $cities_->city as $c )
+
+		foreach( $cities_->item as $c )
 		{
-			$cities[strval($c->id)] = strval($c->nameUkr);
+
+			$cities[strval($c->CityID)] = strval($c->Description);
 		}
 		if ( !empty( $in_cart ) )
@@ -318,18 +319,18 @@ class MenuController extends \controllers\ControllerBase
         $length     = strlen($term);
         $cities_    = $this->novaposhta->city();
-        foreach( $cities_->city as $c )
+        foreach( $cities_->item as $c )
         {
-            $cities[strval($c->id)] = strval($c->nameUkr);
+			$cities[strval($c->CityID)] = strval($c->Description);
-            if( mb_strtolower( substr( strval($c->nameUkr), 0, $length ), 'utf-8' ) == mb_strtolower( $term, 'utf-8' ) )
+            if( mb_strtolower( substr( strval($c->Description), 0, $length ), 'utf-8' ) == mb_strtolower( $term, 'utf-8' ) )
             {
                 $selected_cities[] =
                     [
-                        'label' => strval($c->nameUkr),
-                        'value' => strval($c->nameUkr),
-                        'id'    => strval($c->id),
-                        'ref'   => strval($c->ref)
+                        'label' => strval($c->Description),
+                        'value' => strval($c->Ref),
+                        'id'    => strval($c->CityID),
+                        'ref'   => strval($c->Ref)
                     ];
             }
         }
@@ -345,13 +346,13 @@ class MenuController extends \controllers\ControllerBase
         $city       = $this->request->getPost('city', 'string', '' );
         $offices_   = $this->novaposhta->warenhouse( $city );
-        foreach( $offices_->warenhouse as $c )
+        foreach( $offices_->item as $c )
         {
             $offices[] =
                 [
-                    'number'    => strval($c->number),
-                    'address'   => strval($c->address),
-                    'store_ref' => strval($c->ref)
+                    'number'    => strval($c->Number),
+                    'address'   => strval($c->Description),
+                    'store_ref' => strval($c->Ref)
                 ];
         }
@@ -21,7 +21,7 @@ namespace
         protected $_sender_warehouse_ref    = '1';
         protected $_out_name                = 'Петров Иван Иваныч';
         protected $_out_phone               = '0671234567';
-        protected $_api_key                 = 'f77cc4bcaa985eb481ed289b89e6fb9e';
+        protected $_api_key                 = '46eb7be54b344abfe21feab2ee17071c';
         protected $_description             = 'Насіння';
         protected $_pack                    = 'Пакет';
         protected $_rcpt_name               = 'Приватна особа';
@@ -35,7 +35,7 @@ namespace
         public function send($xml)
         {
             $ch = curl_init();
-            curl_setopt($ch, CURLOPT_URL, 'http://orders.novaposhta.ua/xml.php');
+            curl_setopt($ch, CURLOPT_URL, 'https://api.novaposhta.ua/v2.0/xml/');
             curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
             curl_setopt($ch, CURLOPT_HTTPHEADER, Array("Content-Type: text/xml"));
             curl_setopt($ch, CURLOPT_HEADER, 0);
@@ -230,22 +230,22 @@ namespace
          * Запрос на получение списка складов Новой почты для определённого города (или полный список, если город не указан)
         $filter — город, по которому нужно отфильтровать список складов Новой почты
          */
-        public function warenhouse($filter=false)
+        public function warenhouse($filter = false)
         {
-            $xml =
-                '<?xml version="1.0" encoding="utf-8"?>
-                <file>
-                <auth>'.$this->_api_key.'</auth>
-                <warenhouse/>';
-                if($filter)
-                {
-                    $xml.='<filter>'.$filter.'</filter>';
-                }
-                $xml.='</file>';
-            $xml = simplexml_load_string($this->send($xml));
-            return($xml->result->whs);
+            $xml = '<?xml version="1.0" encoding="UTF-8"?>
+            <file>
+             <apiKey>'.$this->_api_key.'</apiKey>
+             <calledMethod>getWarehouses</calledMethod>
+             <methodProperties>'.
+                            ($filter ? "<CityRef>$filter</CityRef>" : "")
+             .'</methodProperties>
+             <modelName>Address</modelName>
+            </file>';
+
+            $xml = simplexml_load_string($this->send($xml));
+            return($xml->data);
         }
         /////////////////////////////////////////////////////////////////////////////
@@ -262,9 +262,16 @@ namespace
                 <city/>
                 </file>';
-            $xml = simplexml_load_string( $this->send($xml) );
+            $xml = '<?xml version="1.0" encoding="UTF-8"?>
+<file>
+ <apiKey>'.$this->_api_key.'</apiKey>
+ <calledMethod>getCities</calledMethod>
+ <methodProperties/>
+ <modelName>Address</modelName>
+</file>';
-            return($xml->result->cities);
+            $xml = simplexml_load_string( $this->send($xml) );
+            return($xml->data);
         }
         /////////////////////////////////////////////////////////////////////////////
@@ -302,6 +309,7 @@ namespace
             return($xml);
         }
+
         /////////////////////////////////////////////////////////////////////////////
     }
@@ -133,7 +133,7 @@ function getNovaPoshtaCity()
         minLength: 2,
         select: function( event, ui )
         {
-            $( "#order_city_novaposhta" ).val( ui.item.value );
+            $( "#order_city_novaposhta" ).val( ui.item.label );
             $( "#order_city_ref" ).val( ui.item.ref );
             $('#loading_city').addClass('display_none');
@@ -126,7 +126,7 @@ function getNovaPoshtaCity()
         minLength: 2,
         select: function( event, ui )
         {
-            $( "#order_city_novaposhta" ).val( ui.item.value );
+            $( "#order_city_novaposhta" ).val( ui.item.label );
             $( "#order_city_ref" ).val( ui.item.ref );
             $('#loading_city').addClass('display_none');