From e20c3629768fec93c3b525fc9859568165acd0f9 Mon Sep 17 00:00:00 2001 From: Kerim Date: Sat, 2 Sep 2023 19:11:11 +0500 Subject: [PATCH] order detail --- .../API/Http/Controllers/SellerProduct.php | 4 +- .../Http/Controllers/SellerProduct.php.save.1 | 250 ------------------ ...Product.php.save => SellerProduct_old.php} | 44 ++- 3 files changed, 45 insertions(+), 253 deletions(-) delete mode 100644 packages/Sarga/API/Http/Controllers/SellerProduct.php.save.1 rename packages/Sarga/API/Http/Controllers/{SellerProduct.php.save => SellerProduct_old.php} (85%) diff --git a/packages/Sarga/API/Http/Controllers/SellerProduct.php b/packages/Sarga/API/Http/Controllers/SellerProduct.php index a1ca0c5..6fa0794 100644 --- a/packages/Sarga/API/Http/Controllers/SellerProduct.php +++ b/packages/Sarga/API/Http/Controllers/SellerProduct.php @@ -76,8 +76,10 @@ class SellerProduct extends SellerProductController $orderItems = SellerOrderItemModel::where('marketplace_order_id', $request->get('order_id'))->with(['product', 'item'])->paginate(12); + $order = SellerOrderModel::where('id', $request->get('order_id'))->with('order.customer')->first(); + if ($orderItems) { - return response($orderItems); + return response($orderItems, $order); } else { return response([ 'status' => 500, diff --git a/packages/Sarga/API/Http/Controllers/SellerProduct.php.save.1 b/packages/Sarga/API/Http/Controllers/SellerProduct.php.save.1 deleted file mode 100644 index 0c34f93..0000000 --- a/packages/Sarga/API/Http/Controllers/SellerProduct.php.save.1 +++ /dev/null @@ -1,250 +0,0 @@ -_config = request('_config'); - $this->productRepository = $productRepository; - $this->sellerRepository = $sellerRepository; - } - - - public function sellerOrders(Request $request) - { - $validation = Validator::make($request->all(), [ - 'seller_id' => 'required', - 'user' => 'required', - 'password' => 'required', - ]); - - - if ($validation->fails()) { - return response()->json(['errors' => $validation->getMessageBag()->all()], 422); - } - - $user = $request->get('user'); - $pass = $request->get('password'); - - if ($user == "romanah_" && $pass == "bt110226$$") { - - $seller = $this->sellerRepository->isSellerMarket($request->get('seller_id')); - - if ($seller) { - $orders = SellerOrderModel::where('marketplace_seller_id', $seller->id)->with('order.customer')->paginate(15); - return response($orders); - } else { - return response([ - 'status' => 500, - 'message' => 'not found seller' - ]); - } - } else { - return response([ - 'status' => 500, - 'message' => 'not authorized' - ]); - } - } - - public function storeSellerProd(Request $request) - { - $data = $request->all(); - $validation = Validator::make($request->all(), [ - 'type' => 'required', - 'sku' => ['required', 'unique:products,sku', new \Webkul\Core\Contracts\Validations\Slug], - 'marketplace_seller_id' => 'required', - 'user' => 'required', - 'password' => 'required', - ]); - - - if ($validation->fails()) { - return response()->json(['errors' => $validation->getMessageBag()->all()], 422); - } - - $user = $request->get('user'); - $pass = $request->get('password'); - - if ($user == "romanah_" && $pass == "bt110226$$") { - - $product = new Product; - - $product->type = 'simple'; - $product->attribute_family_id = '1'; - $product->sku = $request->get('sku'); - $product->save(); - - if (!$product) { - response([ - 'error' => "error create prod" - ]); - } - - $sellerProduct = new SellerProductModel; - $sellerProduct->price = 0; - $sellerProduct->description = ""; - $sellerProduct->is_approved = 0; - $sellerProduct->is_owner = 0; - $sellerProduct->product_id = $product->id; - $sellerProduct->marketplace_seller_id = $request->get('marketplace_seller_id'); - $sellerProduct->save(); - - if (!$sellerProduct) { - response([ - 'error' => "error create SELLER prod" - ]); - } - - $productInventory = ProductInventory::create([ - 'qty' => 0, - 'product_id' => $product->id, - 'inventory_source_id' => 1, - 'vendor_id' => $request->get('marketplace_seller_id') - ]); - - if (!$productInventory) { - response([ - 'error' => "error create prod inventory" - ]); - } - - return response([ - 'status' => 200, - 'data' => $product, - 'message' => 'succesfully created product' - ]); - } else { - return response([ - 'status' => 500, - 'message' => 'not authorized' - ]); - } - } - - public function updateProductFlat(Request $request) - { - $validation = Validator::make($request->all(), [ - 'product_id' => 'required', - 'user' => 'required', - 'password' => 'required', - ]); - - - if ($validation->fails()) { - return response()->json(['errors' => $validation->getMessageBag()->all()], 422); - } - - $user = $request->get('user'); - $pass = $request->get('password'); - - if ($user == "romanah_" && $pass == "bt110226$$") { - - $prodId = $request->get('product_id'); - - // $product = ProductFlat::where('product_id', $prodId)->first(); - - // \Log::info($product); - - -// \Log::info($request['images']['files']); -// \Log::info($request['imagess']['files']); -// dd($request->get('images')); -// dd($request['images']); - $data = array( - "status" => $request->get('status'), - "product_number" => $request->get('product_number'), - "name" => $request->get('name'), - "description" => $request->get('description'), - "url_key" => Str::slug($request->get('name')), - "featured" => $request->get('featured'), - "status" => $request->get('status'), - "price" => $request->get('price'), - "special_price" => $request->get('special_price'), - "weight" => 0, - "visible_individually" => 1, - "locale" => 'tm', - "channel" => 'Nurgul', - "short_description" => $request->get('short_description'), - "images" => $request['images'], - ); - - $product = $this->productRepository->update($data, $prodId, 'id'); - - - $productInventory = ProductInventory::where('product_id', $prodId)->first(); - if ($productInventory) { - $productInventory->qty = $request->get('qty'); - $productInventory->save(); - } else { - return response([ - 'status' => 500, - 'message' => 'cant find product inv' - ]); - } - - if ($product && $productInventory) { - return response([ - 'status' => 200, - 'data' => $product, - 'message' => 'succesfully updated product' - ]); - } else { - return response([ - 'status' => 500, - 'message' => 'cant update product' - ]); - } - } else { - return response([ - 'status' => 500, - 'message' => 'not authorized' - ]); - } - } -} diff --git a/packages/Sarga/API/Http/Controllers/SellerProduct.php.save b/packages/Sarga/API/Http/Controllers/SellerProduct_old.php similarity index 85% rename from packages/Sarga/API/Http/Controllers/SellerProduct.php.save rename to packages/Sarga/API/Http/Controllers/SellerProduct_old.php index 37107c0..a1ca0c5 100644 --- a/packages/Sarga/API/Http/Controllers/SellerProduct.php.save +++ b/packages/Sarga/API/Http/Controllers/SellerProduct_old.php @@ -17,6 +17,7 @@ use Webkul\Product\Repositories\ProductRepository; use Webkul\Marketplace\Repositories\SellerRepository; use Webkul\Marketplace\Models\Product as SellerProductModel; use Webkul\Marketplace\Models\Order as SellerOrderModel; +use Webkul\Marketplace\Models\OrderItem as SellerOrderItemModel; class SellerProduct extends SellerProductController { @@ -55,6 +56,42 @@ class SellerProduct extends SellerProductController } + public function sellerOrderDetail(Request $request) + { + $validation = Validator::make($request->all(), [ + 'order_id' => 'required', + 'user' => 'required', + 'password' => 'required', + ]); + + + if ($validation->fails()) { + return response()->json(['errors' => $validation->getMessageBag()->all()], 422); + } + + $user = $request->get('user'); + $pass = $request->get('password'); + + if ($user == "romanah_" && $pass == "bt110226$$") { + + $orderItems = SellerOrderItemModel::where('marketplace_order_id', $request->get('order_id'))->with(['product', 'item'])->paginate(12); + + if ($orderItems) { + return response($orderItems); + } else { + return response([ + 'status' => 500, + 'message' => 'not found order Items' + ]); + } + } else { + return response([ + 'status' => 500, + 'message' => 'not authorized' + ]); + } + } + public function sellerOrders(Request $request) { $validation = Validator::make($request->all(), [ @@ -191,8 +228,11 @@ class SellerProduct extends SellerProductController // \Log::info($product); - \Log::info($request['images']['files'][0]); - + //$images = json_decode($request['images']['files'][0]); + //\Log::info($images); + //\Log::info($request->all()); + \Log::info($request['images']); + \Log::info($request['surats']); // dd($request->get('images')); // dd($request['images']); $data = array(