Merge branch 'feature/EK-856' into feature/EK-879

backendApi/modules/v1/controllers/UserController.php

@@ -1211,11 +1211,17 @@ class UserController extends BaseController
             ->asArray()
             ->all();
 
-        $adminId = Yii::$app->getUser()->getUserInfo()['id'];
-        $adminCountry = AdminCountry::getCountry($adminId);
-
         $countries = Countries::getFromCache();
-        $countries = array_filter($countries, fn($country) => in_array($country['ID'], $adminCountry));
+
+        $isSuper = AdminRole::isSuperAdmin(\Yii::$app->getUser()->getUserInfo()['roleId']);
+        if (!$isSuper) {
+            $adminId = Yii::$app->getUser()->getUserInfo()['id'];
+            $adminCountry = AdminCountry::getCountry($adminId);
+
+            $countries = array_filter($countries, fn($country) => in_array($country['ID'], $adminCountry));
+            $countries = array_values($countries);
+        }
+
         $data['country'] = array_values($countries);
 
         $data['userInfo'] = [

common/models/Region.php

@@ -133,10 +133,13 @@ class Region extends \common\components\ActiveRecord
     public static function getWarehouseByCode($regionCode){
         //'540000','710000','810000','820000'
         $ZoningArr = [
-            '01'=>['10100','10200','10300','10400','10500','10600','10700','10800','10900',
+            '01' => ['10100','10200','10300','10400','10500','10600','10700','10800','10900',
                 '11000','11100','11200','11300','11400','11500','11600','11700','11800',
                 '11900','12000','12100','12200','12300','12400','12500','12600','12700',
-                '12800','12900','13000','13100','13200','13300','13400','13500','13600','19900']
+                '12800','12900','13000','13100','13200','13300','13400','13500','13600','19900',
+
+                '10000', '10001', '10002', '10003', '10004', '10005', '10006',
+                ]
         ];
         $zoning = '';
         foreach ($ZoningArr as $key=>$val){