Merge pull request #28 from EaDesgin/feature/MLC-246-Import-module-fr…

…om-bitbucket

MLC-246: Import module from BitBucket

Block/Adminhtml/Xtea/Edit/Tab/Curier.php

@@ -10,7 +10,7 @@
 use Eadesigndev\Awb\Model\Sources\PaymentMethod;
 use Eadesigndev\Awb\Model\Sources\DeliveryPayment;
 use Eadesigndev\Awb\Model\Sources\Tariff;
-use Eadesigndev\Awb\Model\Sources\PickupId;
+use Eadesigndev\Urgent\Model\Sources\PickupId;
 use Eadesigndev\Awb\Model\Sources\InputType;
 use Magento\Backend\Block\Template\Context;
 use Magento\Backend\Block\Widget\Tab\TabInterface;

Block/Adminhtml/Xtea/EditAwb.php

@@ -92,4 +92,4 @@ public function _construct()
             __('Delete Awb')
         );
     }
-}
+}

Model/Sources/Tariff.php

@@ -6,28 +6,56 @@
 
 namespace Eadesigndev\Awb\Model\Sources;
 
+use Eadesigndev\Urgent\Helper\ConnectUrgent;
+
 /**
  * Class Tariff
  * @package Eadesigndev\Awb\ModelSource
  */
 class Tariff extends AbstractSource
 {
     /**
-     * Tariff
+     * @var ConnectUrgent
      */
-    const ACT = 84828;
-    const MKT = 64252;
+    private $connectUrgent;
+
+    /**
+     * Tariff constructor.
+     * @param ConnectUrgent $connectUrgent
+     */
+    public function __construct(
+        ConnectUrgent $connectUrgent
+    ) {
+        $this->connectUrgent     = $connectUrgent;
+    }
 
     /**
+     * @param $array
+     * @param $key
+     * @param $value
      * @return array
      */
-    public function getAvailable()
+    public function toOptionArrayReplaceList($array, $key, $value): ?array
     {
-        $tariffPlan = [
-            self::ACT => __('Act Add 01.11.2018'),
-            self::MKT => __('Tarif MKT Place 5106'),
-        ];
+        if (!empty($array)) {
+            $return = [];
+            foreach ($array as $element) {
+                $return[$element[$key]] = $element[$value];
+            }
+            return $return;
+        }
+    }
 
-        return $tariffPlan;
+    /**
+     * @return array
+     */
+    public function getAvailable(): array
+    {
+        $connectUrgent = $this->connectUrgent;
+        $tariffPlan = $connectUrgent->connect('PriceTables', \Zend_Http_Client::GET);
+        if ($tariffPlan != '"Failed to authenticate!"') {
+            return $this->toOptionArrayReplaceList($tariffPlan, 'PriceTableId', 'Name');
+        }
+        return ['0'=> 'Failed to authenticate!'];
     }
 }

composer.json

@@ -2,7 +2,7 @@
   "name": "eadesignro/awb",
   "description": "AWB module who manages parcel dispatches",
   "type": "magento2-module",
-  "version": "1.1.9",
+  "version": "1.1.11",
   "autoload": {
     "files": [
       "registration.php"
@@ -25,7 +25,7 @@
   },
 
   "require": {
-    "php": "~7.1.3|~7.2.0",
+    "php": "~7.1.3|~7.2.0|~7.3.0",
     "magento/module-backend": "101.0.*",
     "magento/module-sales": "102.0.*",
     "magento/framework": "102.0.*",
@@ -42,4 +42,4 @@
   },
   "minimum-stability": "dev",
   "prefer-stable": true
-}
+}

etc/module.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Eadesigndev_Awb" setup_version="1.1.9"/>
+    <module name="Eadesigndev_Awb" setup_version="1.1.11"/>
 </config>

view/adminhtml/ui_component/awb_fields_listing.xml

@@ -287,7 +287,7 @@
         </column>
         <column name="awb_pickup_id">
             <argument name="data" xsi:type="array">
-                <item name="options" xsi:type="object">Eadesigndev\Awb\Model\Sources\PickupId</item>
+                <item name="options" xsi:type="object">Eadesigndev\Urgent\Model\Sources\PickupId</item>
                 <item name="config" xsi:type="array">
                     <item name="filter" xsi:type="string">select</item>
                     <item name="component" xsi:type="string">Magento_Ui/js/grid/columns/select</item>