Merge branch 'master' of http://git.ichunt.net/semour/semour_admin

app/Admin/Controllers/Api/OrderApiController.php

@@ -90,6 +90,7 @@ class OrderApiController extends BaseController
             "order_amount"=>decimal_number_format_usd($orderInfo["order_amount"]),
             "order_amount"=>decimal_number_format_usd($orderInfo["order_amount"]),
             "return_order_amount"=>$returnAmount,
             "return_order_amount"=>$returnAmount,
             "return_order_amount_format"=>decimal_number_format_usd($returnAmount),
             "return_order_amount_format"=>decimal_number_format_usd($returnAmount),
+            "order_remark"=>$orderInfo["order_remark"],
         ],"count"=>count($orderInfo["orderItemList"] )]);
         ],"count"=>count($orderInfo["orderItemList"] )]);
     }
     }
 
 

app/Admin/Forms/User/EditUserHandle.php

@@ -61,7 +61,7 @@ class EditUserHandle extends Form implements LazyRenderable
             $form->width(5)->text('last_name');
             $form->width(5)->text('last_name');
         });
         });
         $this->row(function (Row $form) {
         $this->row(function (Row $form) {
-            $form->width(5)->number('phone')->required();
+            $form->width(5)->mobile('phone')->required();
             $form->width(5)->email('email');
             $form->width(5)->email('email');
         });
         });
         $this->row(function (Row $form) {
         $this->row(function (Row $form) {

app/Admin/Forms/UserAddress/SaveUserAddressHandle.php

@@ -93,7 +93,7 @@ class SaveUserAddressHandle extends Form implements LazyRenderable
         });
         });
         $this->row(function (Row $row) {
         $this->row(function (Row $row) {
             $row->width(3)->email('email')->required();
             $row->width(3)->email('email')->required();
-            $row->width(3)->number('phone')->required();
+            $row->width(3)->mobile('phone')->required();
         });
         });
         $this->row(function (Row $row) {
         $this->row(function (Row $row) {
             $row->width(3)->select('country')->options(Country::getCountryMap())->required();
             $row->width(3)->select('country')->options(Country::getCountryMap())->required();

app/Admin/Renderable/CreateUser.php

@@ -34,7 +34,7 @@ class CreateUser extends \Dcat\Admin\Support\LazyRenderable
                 $form->width(4)->text('last_name')->required();
                 $form->width(4)->text('last_name')->required();
             });
             });
             $form->row(function (Form\Row $form) {
             $form->row(function (Form\Row $form) {
-                $form->width(4)->number('phone')->required();
+                $form->width(4)->mobile('phone')->required();
                 $form->width(4)->email('email')->required();
                 $form->width(4)->email('email')->required();
             });
             });
             $form->row(function (Form\Row $form) {
             $form->row(function (Form\Row $form) {
@@ -56,7 +56,7 @@ class CreateUser extends \Dcat\Admin\Support\LazyRenderable
                     });
                     });
                     $table->row(function (Form\Row $table) {
                     $table->row(function (Form\Row $table) {
                         $table->width(3)->email('email')->label(trans("user-address.fields.email"))->required();
                         $table->width(3)->email('email')->label(trans("user-address.fields.email"))->required();
-                        $table->width(3)->number('phone')->label(trans("user-address.fields.phone"))->required();
+                        $table->width(3)->mobile('phone')->label(trans("user-address.fields.phone"))->required();
                     });
                     });
                     $table->row(function (Form\Row $table) {
                     $table->row(function (Form\Row $table) {
                         $table->width(3)->select('country')->label(trans("user-address.fields.country"))->options
                         $table->width(3)->select('country')->label(trans("user-address.fields.country"))->options

app/Admin/Service/UserAddressService.php

@@ -16,7 +16,7 @@ class UserAddressService
         $grid->column('address_id');
         $grid->column('address_id');
         $grid->column('consignee');
         $grid->column('consignee');
         $grid->email('email');
         $grid->email('email');
-        $grid->number('phone');
+        $grid->mobile('phone');
         $grid->column('detail_address');
         $grid->column('detail_address');
         $grid->column('city');
         $grid->column('city');
         $grid->column('address_type')->using(admin_trans('user-address.options.address_type'));
         $grid->column('address_type')->using(admin_trans('user-address.options.address_type'));