версия 1.6

NodaSoft · Jul 19, 2016 · e42550a · e42550a
1 parent d666b39
commit e42550a
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 23 deletions.
diff --git a/Common/TecDocApiConfig.php b/Common/TecDocApiConfig.php
@@ -9,6 +9,7 @@
  */
 class TecDocApiConfig
 {
+    const HOST = 'tecdoc3.api.abcp.ru';
     const USER_KEY = 'USER_KEY';
     const USER_LOGIN = 'USER_LOGIN';
     const USER_PSW = 'USER_PSW';

diff --git a/Pages/Adaptability.php b/Pages/Adaptability.php
@@ -22,7 +22,8 @@ class Adaptability implements PageInterface
     public function getHtml()
     {
         $tecDocRestClient = new TecDoc();
-        $tecDocRestClient->setUserKey(TecDocApiConfig::USER_KEY)
+        $tecDocRestClient->setTecdocHost(TecDocApiConfig::HOST)
+            ->setUserKey(TecDocApiConfig::USER_KEY)
             ->setUserLogin(TecDocApiConfig::USER_LOGIN)
             ->setUserPsw(TecDocApiConfig::USER_PSW);
         $articleId = $_GET['articleId'];

diff --git a/Pages/Analogs.php b/Pages/Analogs.php
@@ -23,7 +23,8 @@ class Analogs implements PageInterface
     public function getHtml()
     {
         $tecDocRestClient = new TecDoc();
-        $tecDocRestClient->setUserKey(TecDocApiConfig::USER_KEY)
+        $tecDocRestClient->setTecdocHost(TecDocApiConfig::HOST)
+            ->setUserKey(TecDocApiConfig::USER_KEY)
             ->setUserLogin(TecDocApiConfig::USER_LOGIN)
             ->setUserPsw(TecDocApiConfig::USER_PSW);
         $number = $_GET['number'];

diff --git a/Pages/ArticleInfo.php b/Pages/ArticleInfo.php
@@ -22,7 +22,8 @@ class ArticleInfo implements PageInterface
     public function getHtml()
     {
         $tecDocRestClient = new TecDoc();
-        $tecDocRestClient->setUserKey(TecDocApiConfig::USER_KEY)
+        $tecDocRestClient->setTecdocHost(TecDocApiConfig::HOST)
+            ->setUserKey(TecDocApiConfig::USER_KEY)
             ->setUserLogin(TecDocApiConfig::USER_LOGIN)
             ->setUserPsw(TecDocApiConfig::USER_PSW);
         $articleId = $_GET['articleId'];

diff --git a/Pages/FullInfoModelVariant.php b/Pages/FullInfoModelVariant.php
@@ -22,7 +22,8 @@ class FullInfoModelVariant implements PageInterface
     public function getHtml()
     {
         $tecDocRestClient = new TecDoc();
-        $tecDocRestClient->setUserKey(TecDocApiConfig::USER_KEY)
+        $tecDocRestClient->setTecdocHost(TecDocApiConfig::HOST)
+            ->setUserKey(TecDocApiConfig::USER_KEY)
             ->setUserLogin(TecDocApiConfig::USER_LOGIN)
             ->setUserPsw(TecDocApiConfig::USER_PSW);
         $modelId = $_GET['modelVariant'];

diff --git a/Pages/Group.php b/Pages/Group.php
@@ -37,12 +37,13 @@ class Group implements PageInterface
     public function getHtml()
     {
         $tecDocRestClient = new TecDoc();
-        $tecDocRestClient->setUserKey(TecDocApiConfig::USER_KEY)
+        $tecDocRestClient->setTecdocHost(TecDocApiConfig::HOST)
+            ->setUserKey(TecDocApiConfig::USER_KEY)
             ->setUserLogin(TecDocApiConfig::USER_LOGIN)
             ->setUserPsw(TecDocApiConfig::USER_PSW);
         $modificationId = $_GET['modelVariant'];
         $categoryId = $_GET['group'];
-        $articles = $tecDocRestClient->getArticleSimplified($modificationId, $categoryId);
+        $articles = $tecDocRestClient->getArticleSimplified($modificationId, $categoryId, [], 0);
         $viewMode = isset($_GET['viewMode']) ? $_GET['viewMode'] : self::DEFAULT_VIEW_MODE;
         $itemsPerPage = isset($_GET['itemsPerPage']) && in_array((int)$_GET['itemsPerPage'], $this->itemsPerPage,
             true) ? (int)$_GET['itemsPerPage'] : current($this->itemsPerPage);
@@ -85,7 +86,8 @@ public function getHtml()
     private static function getBreadcrumbs()
     {
         $tecDocRestClient = new TecDoc();
-        $tecDocRestClient->setUserKey(TecDocApiConfig::USER_KEY)
+        $tecDocRestClient->setTecdocHost(TecDocApiConfig::HOST)
+            ->setUserKey(TecDocApiConfig::USER_KEY)
             ->setUserLogin(TecDocApiConfig::USER_LOGIN)
             ->setUserPsw(TecDocApiConfig::USER_PSW);
         $modificationId = (int)$_GET['modelVariant'];

diff --git a/Pages/Index.php b/Pages/Index.php
@@ -22,7 +22,8 @@ class Index implements PageInterface
     public function getHtml()
     {
         $tecDocRestClient = new TecDoc();
-        $tecDocRestClient->setUserKey(TecDocApiConfig::USER_KEY)
+        $tecDocRestClient->setTecdocHost(TecDocApiConfig::HOST)
+            ->setUserKey(TecDocApiConfig::USER_KEY)
             ->setUserLogin(TecDocApiConfig::USER_LOGIN)
             ->setUserPsw(TecDocApiConfig::USER_PSW);
         $carType = isset($_GET['carType']) ? $_GET['carType'] : 0;

diff --git a/Pages/ModelVariant.php b/Pages/ModelVariant.php
@@ -22,7 +22,8 @@ class ModelVariant implements PageInterface
     public function getHtml()
     {
         $tecDocRestClient = new TecDoc();
-        $tecDocRestClient->setUserKey(TecDocApiConfig::USER_KEY)
+        $tecDocRestClient->setTecdocHost(TecDocApiConfig::HOST)
+            ->setUserKey(TecDocApiConfig::USER_KEY)
             ->setUserLogin(TecDocApiConfig::USER_LOGIN)
             ->setUserPsw(TecDocApiConfig::USER_PSW);
         $modificationId = $_GET['modelVariant'];
@@ -45,7 +46,8 @@ public function getHtml()
     private static function getBreadcrumbs()
     {
         $tecDocRestClient = new TecDoc();
-        $tecDocRestClient->setUserKey(TecDocApiConfig::USER_KEY)
+        $tecDocRestClient->setTecdocHost(TecDocApiConfig::HOST)
+            ->setUserKey(TecDocApiConfig::USER_KEY)
             ->setUserLogin(TecDocApiConfig::USER_LOGIN)
             ->setUserPsw(TecDocApiConfig::USER_PSW);
         $modificationId = (int)$_GET['modelVariant'];

diff --git a/Pages/Models.php b/Pages/Models.php
@@ -22,7 +22,8 @@ class Models implements PageInterface
     public function getHtml()
     {
         $tecDocRestClient = new TecDoc();
-        $tecDocRestClient->setUserKey(TecDocApiConfig::USER_KEY)
+        $tecDocRestClient->setTecdocHost(TecDocApiConfig::HOST)
+            ->setUserKey(TecDocApiConfig::USER_KEY)
             ->setUserLogin(TecDocApiConfig::USER_LOGIN)
             ->setUserPsw(TecDocApiConfig::USER_PSW);
         $manufacturerId = $_GET['man'];
@@ -81,7 +82,8 @@ public function getHtml()
     private static function getBreadcrumbs()
     {
         $tecDocRestClient = new TecDoc();
-        $tecDocRestClient->setUserKey(TecDocApiConfig::USER_KEY)
+        $tecDocRestClient->setTecdocHost(TecDocApiConfig::HOST)
+            ->setUserKey(TecDocApiConfig::USER_KEY)
             ->setUserLogin(TecDocApiConfig::USER_LOGIN)
             ->setUserPsw(TecDocApiConfig::USER_PSW);
         $breadcrumbs = array();

diff --git a/Pages/Modifications.php b/Pages/Modifications.php
@@ -22,7 +22,8 @@ class Modifications implements PageInterface
     public function getHtml()
     {
         $tecDocRestClient = new TecDoc();
-        $tecDocRestClient->setUserKey(TecDocApiConfig::USER_KEY)
+        $tecDocRestClient->setTecdocHost(TecDocApiConfig::HOST)
+            ->setUserKey(TecDocApiConfig::USER_KEY)
             ->setUserLogin(TecDocApiConfig::USER_LOGIN)
             ->setUserPsw(TecDocApiConfig::USER_PSW);
         $manufacturerId = $_GET['man'];
@@ -46,7 +47,8 @@ public function getHtml()
     private static function getBreadcrumbs()
     {
         $tecDocRestClient = new TecDoc();
-        $tecDocRestClient->setUserKey(TecDocApiConfig::USER_KEY)
+        $tecDocRestClient->setTecdocHost(TecDocApiConfig::HOST)
+            ->setUserKey(TecDocApiConfig::USER_KEY)
             ->setUserLogin(TecDocApiConfig::USER_LOGIN)
             ->setUserPsw(TecDocApiConfig::USER_PSW);
         $breadcrumbs = array();

diff --git a/View/full.info.model.variant.tpl b/View/full.info.model.variant.tpl
@@ -42,7 +42,7 @@
 		</tr>
 		<tr>
 			<td>Код двигателя</td>
-			<td>{$data.modification->motorCodes|implode:','}</td>
+			<td>{$data.modification->motorCodes}</td>
 		</tr>
 		<tr>
 			<td>Вид двигателя</td>

diff --git a/composer.json b/composer.json
@@ -10,6 +10,6 @@
   ],
   "require": {
     "smarty/smarty": "v3.1.19",
-    "nodasoft/abcp_api_client": "1.3"
+    "nodasoft/abcp_api_client": "3.2"
   }
 }
diff --git a/composer.lock b/composer.lock