플러그인 유닛테스트 추가

.gitignore

@@ -1,6 +1,5 @@
 vendor
 composer.lock
-Tests
 assets/node_modules
 src/Components/Skins/XeroCommerceDefault/assets/node_modules
 

composer.json

@@ -108,11 +108,15 @@
   },
   "autoload": {
     "psr-4": {
-      "Xpressengine\\Plugins\\XeroCommerce\\": "src/",
+      "Xpressengine\\Plugins\\XeroCommerce\\": [
+        "src/",
+        "./"
+      ],
       "Xpressengine\\XePlugin\\XeroPay\\": [
         "payment/src/",
         "payment/"
-      ]
+      ],
+      "Xpressengine\\Plugins\\XeroCommerce\\Test\\": "tests/"
     }
   },
   "config": {

payment/src/Resources.php

@@ -107,4 +107,10 @@ public static function makeDataTable()
             $table->timestamps();
         });
     }
+
+    public static function deleteDataTable(){
+        Schema::dropIfExists('xero_pay_payment');
+
+        Schema::dropIfExists('xero_pay_log');
+    }
 }

src/Dev.php

@@ -2,6 +2,7 @@
 
 namespace Xpressengine\Plugins\XeroCommerce;
 
+use App\Facades\XeConfig;
 use Faker\Factory;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
@@ -206,7 +207,7 @@ private function storeProductCategory($product)
 
     private function getXeroCommerceCategoryIds()
     {
-        $config = \XeConfig::get(Plugin::getId());
+        $config = XeConfig::get(Plugin::getId());
 
         $categoryId = $config->get('categoryId');
 

src/Handlers/CartHandler.php

@@ -19,12 +19,19 @@ public function getCartList()
 
     public function getCartListByCartIds($cart_ids)
     {
-        return $this->getCartQuery()->whereIn('id', $cart_ids)->get();
+        if (is_iterable($cart_ids)) {
+            return $this->getCartQuery()->whereIn('id', $cart_ids)->get();
+        }else{
+            return $this->getCartQuery()->where('id', $cart_ids)->get();
+        }
     }
 
     private function getCartQuery()
     {
-        return Cart::where('user_id', Auth::id() ?: \request()->ip())->latest();
+        if (is_null($user_id = Auth::id())) {
+            $user_id = \request()->ip();
+        }
+        return Cart::where('user_id', $user_id)->latest();
     }
 
     public function addCart(SellType $sellType, $cartGroupList, $delivery)
@@ -68,9 +75,9 @@ public function getSellSetList()
     public function makeCartGroup(SellUnit $sellUnit, $count)
     {
         $cartGroup = new CartGroup();
-
-        $sellUnit->cartGroup()->save($cartGroup);
+        $cartGroup->cart_id = 0;
         $cartGroup->setCount($count);
+        $sellUnit->cartGroup()->save($cartGroup);
         $cartGroup->save();
 
         return $cartGroup;

src/Handlers/OrderHandler.php

@@ -53,14 +53,17 @@ public function register($carts)
 
             $orderItem->order_id = $order->id;
             $orderItem->delivery_pay = $cart->delivery_pay;
-            $cart->forcedSellType()->orderItems()->save($orderItem);
+            $orderItem->sellType()->associate($cart->forcedSellType());
+            $orderItem->original_price = $orderItem->getOriginalPrice();
+            $orderItem->sell_price = $orderItem->getSellPrice();
+            $orderItem->code = 0;
 
             $orderItem->save();
 
             $cart->sellGroups->each(function (CartGroup $cartGroup) use (&$orderItem) {
                 $orderItemGroup = new OrderItemGroup();
 
-                $cartGroup->forcedSellUnit()->orderItemGroup()->save($orderItemGroup);
+                $orderItemGroup->sellUnit()->associate($cartGroup->forcedSellUnit());
                 $orderItemGroup->setCount($cartGroup->getCount());
 
                 $orderItem->sellGroups()->save($orderItemGroup);
@@ -102,7 +105,7 @@ public function update(Order $order)
 
     public function paidCheck(Order $order)
     {
-        $payment = $order->payment;
+        $payment = $order->payment()->first();
 
         if ($payment) {
             if ($payment->is_paid) {
@@ -158,11 +161,6 @@ public function afterServiceCheck(Order $order)
         }
     }
 
-    public function updateOrder()
-    {
-
-    }
-
     public function makeOrder()
     {
         $now = now();
@@ -216,6 +214,7 @@ public function makePayment(Order $order)
         $payment->discount = $summary['discount_price'];
         $payment->millage = 0;
         $payment->fare = $summary['fare'];
+        $payment->is_paid=false;
 
         if ($pay = $order->xeropay) {
             $payment->method = $pay->method;
@@ -235,31 +234,31 @@ public function idUpdate(Order $order)
         $this->update($order);
     }
 
-    public function makeDelivery(Order $order, Request $request)
+    public function makeDelivery(Order $order, $args)
     {
-        if (isset($request->delivery['nickname'])) {
-            $del = $request->delivery;
+        if (isset($args['delivery']['nickname'])) {
+            $del = $args['delivery'];
             $del['user_id'] = Auth::id();
             $del['seq'] = UserDelivery::where('user_id', Auth::id())->count() + 1;
 
             UserDelivery::updateOrCreate(
-                ['nickname' => $request->delivery['nickname']],
+                ['nickname' => $args['delivery']['nickname']],
                 $del
             );
         }
 
-        $order->orderItems->each(function (OrderItem $orderItem) use ($request) {
+        $order->orderItems->each(function (OrderItem $orderItem) use ($args) {
             $delivery = new OrderDelivery();
             $delivery->order_item_id = $orderItem->id;
             $delivery->ship_no = '';
             $delivery->status = OrderDelivery::READY;
             $delivery->company_id = $orderItem->sellType->getDelivery()->company->id;
-            $delivery->recv_name = $request->delivery['name'];
-            $delivery->recv_phone = $request->delivery['phone'];
-            $delivery->recv_addr = $request->delivery['addr'] ?: '';
-            $delivery->recv_addr_detail = $request->delivery['addr_detail'];
-            $delivery->recv_addr_post = $request->delivery['addr_post'];
-            $delivery->recv_msg = $request->delivery['msg'];
+            $delivery->recv_name = $args['delivery']['name'];
+            $delivery->recv_phone = $args['delivery']['phone'];
+            $delivery->recv_addr = $args['delivery']['addr'] ?: '';
+            $delivery->recv_addr_detail = $args['delivery']['addr_detail'];
+            $delivery->recv_addr_post = $args['delivery']['addr_post'];
+            $delivery->recv_msg = $args['delivery']['msg'];
             $delivery->save();
         });
 
@@ -290,7 +289,7 @@ public function dailyBoard()
         }
 
         $counts = collect($days)->map(function ($item) {
-            return $this->whereUser()->whereDate('created_at', $item)->count();
+            return $this->whereUser()->where('code','!=',Order::TEMP)->whereDate('created_at', $item)->count();
         })->all();
 
         return [
@@ -318,7 +317,7 @@ public function shipNoRegister(OrderItem $orderItem, $ship_no)
 
         $delivery->setShipNo($ship_no);
 
-        $this->update($order);
+        return $this->update($order);
     }
 
     public function completeDelivery(OrderItem $orderItem)
@@ -336,7 +335,7 @@ public function changeOrderItem(OrderItem $orderItem, $code)
         $orderItem->code = $code;
         $orderItem->save();
 
-        $this->update($order);
+        return $this->update($order);
     }
 
     public function makeOrderAfterservice($type, OrderItem $orderItem, Request $request)
@@ -373,6 +372,7 @@ public function orderCancel(Order $order, $reason)
 
             $this->changeOrderItem($orderItem, Order::CANCELED);
         });
+        return $this->update($order);
     }
 
     public function receiveOrderAfterservice(OrderItem $orderItem)

src/Handlers/ProductHandler.php

@@ -218,7 +218,6 @@ public function store(array $args)
             }
         }
 
-        \Event::dispatch(new NewProductRegisterEvent($newProduct));
 
         return $newProduct->id;
     }
@@ -303,7 +302,7 @@ private function storeRevision($product)
         $revisionProduct->save();
     }
 
-    public function setPublish($productId, boolean $bool)
+    public function setPublish($productId, $bool)
     {
         $product = Product::find($productId);
         $product->publish = $bool;

src/Handlers/ShopHandler.php

@@ -21,8 +21,6 @@ public function store(array $args)
 
         $newShop->save();
 
-        $newShop->users()->sync($args['user_id']);
-
         return $newShop;
     }
 
@@ -73,7 +71,6 @@ public function update(array $args, Shop $shop)
                 $shop->{$key} = $value;
             }
         }
-        $shop->users()->sync($args['user_id']);
 
         $shop->save();
     }

src/Models/OrderDelivery.php

@@ -48,4 +48,9 @@ public function getUrl()
     {
         return $this->company->uri . $this->ship_no;
     }
+
+    public function orderItem()
+    {
+        return $this->belongsTo(OrderItem::class);
+    }
 }

src/Models/OrderItemGroup.php

@@ -20,6 +20,6 @@ function setCount($count)
 
     public function sellSet()
     {
-        return $this->belongsTo(OrderItem::class);
+        return $this->belongsTo(OrderItem::class,'order_item_id');
     }
 }

src/Models/Shop.php

@@ -61,7 +61,8 @@ public function deliveryCompanys()
 
     public function getDefaultDeliveryCompany()
     {
-        return $this->deliveryCompanys()->where('is_default', 1)->first();
+        $default = $this->deliveryCompanys()->where('is_default', 1)->first();
+        return $default?:$this->deliveryCompanys()->first();
     }
 
     public function users()