Преглед изворни кода

订单管理字段翻译及列宽调整

theo пре 3 година
родитељ
комит
d5e7658a4b

+ 1 - 1
backendApi/modules/v1/models/lists/shop/OrderList.php

@@ -174,7 +174,7 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                 ],
                 'ORDER_TYPE' => [
                     'header' => 'Order Type', // 订单类型
-                    'headerOther' => ['width' => '120'],
+                    'headerOther' => ['width' => '140'],
                     'value' => function ($row) {
                         switch ($row['ORDER_TYPE']) {
                             case 'ZC':

+ 1 - 1
common/libs/export/BaseExport.php

@@ -348,7 +348,7 @@ class BaseExport extends Component {
                     'COUNTY' => $regionConfig[$columnData['COUNTY']]['REGION_NAME'] ?? '',
                     'ADDRESS' => $columnData['ADDRESS'],
                     'PERIOD_NUM' => $columnData['PERIOD_NUM'],
-                    'ORDER_TYPE' => ($columnData['ORDER_TYPE'] == 'ZC') ? 'Welcome pack' : (in_array($columnData['PAY_TYPE'], ['cash', 'pay_stack']) ? 'Reselling': 'Points'),
+                    'ORDER_TYPE' => ($columnData['ORDER_TYPE'] == 'ZC') ? 'Welcome pack' : (in_array($columnData['PAY_TYPE'], ['cash', 'pay_stack']) ? 'Repeat Purchase': 'Points'),
                     // 'WAREHOUSE' => $columnData['WAREHOUSE'],
                     'CREATED_AT' => Date('Y-m-d H:i:s', $columnData['CREATED_AT']),
                     'PAY_TYPE' => ShopGoods::payTypes()[$columnData['PAY_TYPE']]['name'] ?? ShopGoods::payTypes()['cash']['name'],

+ 1 - 1
frontendApi/modules/v1/controllers/ShopController.php

@@ -380,7 +380,7 @@ class ShopController extends BaseController {
             if($value['ORDER_TYPE']=='ZC'){
                 $data['list'][$key]['ORDER_TYPE'] = 'Welcome Pack';
             }else{
-                $data['list'][$key]['ORDER_TYPE'] = in_array($value['PAY_TYPE'], ['cash', 'paystack']) ? 'Reselling': 'Points';
+                $data['list'][$key]['ORDER_TYPE'] = in_array($value['PAY_TYPE'], ['cash', 'paystack']) ? 'Repeat Purchase': 'Points';
             }
             $data['list'][$key]['PAY_AT'] = $value['PAY_AT'] ? Date::convert($value['PAY_AT'],'Y-m-d H:i:s') : '';
             $data['list'][$key]['CREATED_AT'] = $value['CREATED_AT'] ? Date::convert($value['CREATED_AT'],'Y-m-d H:i:s') : '';