Merge branch 'dev/ver/1.0.0' of http://git.ichunt.net/semour/semour_web into dev/ver/1.0.0

app/Http/Requests/InquirySave.php

@@ -26,7 +26,7 @@ class InquirySave extends BaseRequest
             'items.*.goods_name' => 'required|string|max:100',
             'items.*.goods_name' => 'required|string|max:100',
             'items.*.brand_name' => 'required|string|max:100',
             'items.*.brand_name' => 'required|string|max:100',
             'items.*.inquiry_number' => 'required|integer',
             'items.*.inquiry_number' => 'required|integer',
-            'remark' => 'max:255|required',
+            'remark' => 'max:255',
         ];
         ];
     }
     }
 }
 }

app/Http/Services/UserAddressService.php

@@ -24,7 +24,9 @@ class UserAddressService
             if (!$hasDefaultAddress) {
             if (!$hasDefaultAddress) {
                 $address['is_default'] = 1;
                 $address['is_default'] = 1;
             } else {
             } else {
-                $address['is_default'] = 0;
+                if ($address['is_default'] == 1) {
+                    UserAddressModel::where('user_id', $user->id)->update(['is_default' => 0]);
+                }
             }
             }
             return UserAddressModel::insertGetId($address);
             return UserAddressModel::insertGetId($address);
         });
         });