浏览代码

fix bug

3.x
Andrew Wallo 4 个月前
父节点
当前提交
4f6d368a8f
共有 1 个文件被更改,包括 18 次插入13 次删除
  1. 18
    13
      app/Models/Common/Client.php

+ 18
- 13
app/Models/Common/Client.php 查看文件

173
 
173
 
174
         if (isset($data['shippingAddress'])) {
174
         if (isset($data['shippingAddress'])) {
175
             $shippingData = $data['shippingAddress'];
175
             $shippingData = $data['shippingAddress'];
176
-            $shippingAddress = [
177
-                'type' => AddressType::Shipping,
178
-                'recipient' => $shippingData['recipient'] ?? null,
179
-                'phone' => $shippingData['phone'] ?? null,
180
-                'notes' => $shippingData['notes'] ?? null,
181
-            ];
182
 
176
 
183
             if ($shippingData['same_as_billing'] ?? false) {
177
             if ($shippingData['same_as_billing'] ?? false) {
184
                 $billingAddress = $this->billingAddress;
178
                 $billingAddress = $this->billingAddress;
185
                 if ($billingAddress) {
179
                 if ($billingAddress) {
186
                     $shippingAddress = [
180
                     $shippingAddress = [
187
-                        ...$shippingAddress,
181
+                        'type' => AddressType::Shipping,
182
+                        'recipient' => $shippingData['recipient'] ?? null,
183
+                        'phone' => $shippingData['phone'] ?? null,
184
+                        'notes' => $shippingData['notes'] ?? null,
188
                         'parent_address_id' => $billingAddress->id,
185
                         'parent_address_id' => $billingAddress->id,
189
                         'address_line_1' => $billingAddress->address_line_1,
186
                         'address_line_1' => $billingAddress->address_line_1,
190
                         'address_line_2' => $billingAddress->address_line_2,
187
                         'address_line_2' => $billingAddress->address_line_2,
193
                         'city' => $billingAddress->city,
190
                         'city' => $billingAddress->city,
194
                         'postal_code' => $billingAddress->postal_code,
191
                         'postal_code' => $billingAddress->postal_code,
195
                     ];
192
                     ];
193
+
194
+                    $this->shippingAddress()->updateOrCreate(
195
+                        ['type' => AddressType::Shipping],
196
+                        $shippingAddress
197
+                    );
196
                 }
198
                 }
197
             } elseif (isset($shippingData['address_line_1'])) {
199
             } elseif (isset($shippingData['address_line_1'])) {
198
                 $shippingAddress = [
200
                 $shippingAddress = [
199
-                    ...$shippingAddress,
201
+                    'type' => AddressType::Shipping,
202
+                    'recipient' => $shippingData['recipient'] ?? null,
203
+                    'phone' => $shippingData['phone'] ?? null,
204
+                    'notes' => $shippingData['notes'] ?? null,
200
                     'parent_address_id' => null,
205
                     'parent_address_id' => null,
201
                     'address_line_1' => $shippingData['address_line_1'],
206
                     'address_line_1' => $shippingData['address_line_1'],
202
                     'address_line_2' => $shippingData['address_line_2'] ?? null,
207
                     'address_line_2' => $shippingData['address_line_2'] ?? null,
205
                     'city' => $shippingData['city'] ?? null,
210
                     'city' => $shippingData['city'] ?? null,
206
                     'postal_code' => $shippingData['postal_code'] ?? null,
211
                     'postal_code' => $shippingData['postal_code'] ?? null,
207
                 ];
212
                 ];
208
-            }
209
 
213
 
210
-            $this->shippingAddress()->updateOrCreate(
211
-                ['type' => AddressType::Shipping],
212
-                $shippingAddress
213
-            );
214
+                $this->shippingAddress()->updateOrCreate(
215
+                    ['type' => AddressType::Shipping],
216
+                    $shippingAddress
217
+                );
218
+            }
214
         }
219
         }
215
 
220
 
216
         return $this;
221
         return $this;

正在加载...
取消
保存