Skip to content

Commit ec2ba88

Browse files
committed
取消推送shopify,只推送ERP
1 parent decd036 commit ec2ba88

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

src/Http/Controllers/Api/V1/OrdersController.php

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@
1919
use Webkul\Shop\Http\Resources\CartResource;
2020
use Illuminate\Support\Facades\Artisan;
2121
use Nicelizhi\Shopify\Console\Commands\Order\Post;
22+
use Nicelizhi\Shopify\Console\Commands\Order\PostOdoo;
2223

2324

2425

2526
class OrdersController extends Controller {
2627

27-
28+
2829
public function __construct(
2930
protected CartRepository $cartRepository,
3031
protected CategoryRepository $categoryRepository,
@@ -37,18 +38,18 @@ public function __construct(
3738
protected CartRuleRepository $cartRuleRepository
3839
)
3940
{
40-
41+
4142
}
4243
/**
4344
* Create a new OrdersController instance.
4445
*
4546
* @param Request $request
46-
*
47+
*
4748
* @access public
4849
* @return \Illuminate\Http\Response
4950
*/
5051
public function create(Request $request) {
51-
52+
5253
$payment_method = $request->input('payment_method');
5354
$payment_method_input = $request->input('payment_method');
5455
$input = $request->all();
@@ -63,7 +64,7 @@ public function create(Request $request) {
6364
Cart::setCart($cart);
6465
}else{
6566
$products = $request->input("products");
66-
//
67+
//
6768
Cart::deActivateCart();
6869
foreach($products as $key=>$product) {
6970
//var_dump($product);
@@ -75,12 +76,12 @@ public function create(Request $request) {
7576
$attr = explode('_', $attr_id);
7677
$super_attribute[$attr[0]] = $attr[1];
7778
}
78-
79+
7980
$product['super_attribute'] = $super_attribute;
8081
}
8182
//Log::info("add product into cart ". json_encode($product));
8283
$cart = Cart::addProduct($product['product_id'], $product);
83-
84+
8485
if (
8586
is_array($cart)
8687
&& isset($cart['warning'])
@@ -89,14 +90,14 @@ public function create(Request $request) {
8990
'message' => $cart['warning'],
9091
]);
9192
}
92-
93+
9394
}
9495
}
95-
96+
9697
$this->returnInsurance($input, $cart);
9798

9899

99-
//
100+
//
100101
$addressData = [];
101102

102103

@@ -249,7 +250,7 @@ public function create(Request $request) {
249250
], Response::HTTP_FORBIDDEN);
250251
}
251252

252-
253+
253254
Cart::collectTotals();
254255
$this->validateOrder();
255256
$cart = Cart::getCart();
@@ -267,7 +268,8 @@ public function create(Request $request) {
267268

268269
// add the order id to ququeue
269270
$queue = config('app.name').':orders';
270-
Artisan::queue((new Post())->getName(), ['--order_id'=> $order->id])->onConnection('rabbitmq')->onQueue($queue);
271+
// Artisan::queue((new Post())->getName(), ['--order_id'=> $order->id])->onConnection('rabbitmq')->onQueue($queue);
272+
Artisan::queue((new PostOdoo())->getName(), ['--order_id'=> $order->id])->onConnection('rabbitmq')->onQueue(config('app.name') . ':odoo_order');
271273

272274

273275
// add the ip address and ip country to order
@@ -282,8 +284,8 @@ public function create(Request $request) {
282284
}
283285

284286
private function returnInsurance($input, $cart) {
285-
// when return insurance eq 1 and auto add the insurance product into cart
286-
$input['return_insurance'] = isset($input['return_insurance']) ? $input['return_insurance'] : 0;
287+
// when return insurance eq 1 and auto add the insurance product into cart
288+
$input['return_insurance'] = isset($input['return_insurance']) ? $input['return_insurance'] : 0;
287289
if($input['return_insurance']==1) {
288290

289291
if(empty(config('onebuy.return_shipping_insurance.product_id'))) {

0 commit comments

Comments
 (0)