merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed preorder bug

This commit is contained in:
Prashant Singh 2019-07-03 18:16:07 +05:30
parent 80ea917581
commit b868887ccc
10 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Webkul/SAASPreOrder/src/Commands/Console/GenerateData.php
View File

@ -9,6 +9,12 @@ use Webkul\Attribute\Repositories\AttributeRepository;
use Webkul\Attribute\Repositories\AttributeFamilyRepository;
use Validator;
/**
* SAASPreOrderSeeder
*
* @author Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
* @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
*/
class GenerateData extends Command
{
/**

2
packages/Webkul/SAASPreOrder/src/Http/Controllers/Shop/PreOrderController.php
View File

@ -45,7 +45,7 @@ class PreOrderController extends Controller
*
* @param Webkul\Product\Repositories\ProductRepository $productRepository
* @param Webkul\Sales\Repositories\OrderItemRepository $orderItemRepository
* @param Webkul\PreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
* @param Webkul\SAASPreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
* @return void
*/
public function __construct(

10
packages/Webkul/SAASPreOrder/src/Listeners/Cart.php
View File

@ -41,7 +41,7 @@ class Cart
*
* @param Webkul\Product\Helpers\Price $priceHelper
* @param Webkul\Product\Repositories\ProductRepository $productRepository
* @param Webkul\PreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
* @param Webkul\SAASPreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
* @return void
*/
public function __construct(
@ -160,6 +160,14 @@ class Cart
if (! request()->input('pre_order_payment')) {
$product = $this->productRepository->find($cartItem->product_id);
if ($product->type == 'configurable') {
if (isset($cartItem->child->product_id)) {
$product = $this->productRepository->find($cartItem->child->product_id);
} else {
return;
}
}
if ($product->totalQuantity() > 0 || ! $product->allow_preorder)
return;

4
packages/Webkul/SAASPreOrder/src/Listeners/Invoice.php
View File

@ -30,7 +30,7 @@ class Invoice
/**
* Create a new Order event listener instance.
*
* @param Webkul\PreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
* @param Webkul\SAASPreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
* @param Webkul\Sales\Repositories\OrderRepository $orderRepository
* @return void
*/
@ -73,4 +73,4 @@ class Invoice
}
}
}
}
}

2
packages/Webkul/SAASPreOrder/src/Listeners/Order.php
View File

@ -32,7 +32,7 @@ class Order
* Create a new Order event listener instance.
*
* @param Webkul\Product\Helpers\Price $priceHelper
* @param Webkul\PreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
* @param Webkul\SAASPreOrder\Repositories\PreOrderItemRepository $preOrderItemRepository
* @return void
*/
public function __construct(

0
packages/Webkul/SAASPreOrder/src/Observers/PreOrderObserver.php → packages/Webkul/SAASPreOrder/src/Observers/SAASPreOrderObserver.php
View File

2
packages/Webkul/SAASPreOrder/src/Resources/views/admin/sales/orders/view.blade.php
View File

@ -31,7 +31,7 @@
</a>
@endif
@if ($order->canShip() && ! app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository')->resetScope()->findOneByField('payment_order_item_id', $item->id))
@if ($order->canShip() && ! app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository')->isPreOrderPaymentOrder($order->id))
<a href="{{ route('admin.sales.shipments.create', $order->id) }}" class="btn btn-lg btn-primary">
{{ __('admin::app.sales.orders.shipment-btn-title') }}
</a>

2
packages/Webkul/SAASPreOrder/src/Resources/views/shop/products/view/product-add.blade.php
View File

@ -16,7 +16,7 @@
@include ('shop::products.buy-now')
<button type="submit" class="btn btn-lg btn-primary pre-order-btn" style="width: 100%; display: none;">
<button type="submit" class="btn btn-lg btn-black pre-order-btn" style="width: 100%; display: none;">
{{ __('preorder::app.shop.products.preorder') }}
</button>
@endif

2
resources/views/vendor/admin/sales/orders/view.blade.php vendored
View File

@ -31,7 +31,7 @@
</a>
@endif
@if ($order->canShip())
@if ($order->canShip() && ! app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository')->isPreOrderPaymentOrder($order->id))
<a href="{{ route('admin.sales.shipments.create', $order->id) }}" class="btn btn-lg btn-primary">
{{ __('admin::app.sales.orders.shipment-btn-title') }}
</a>

6
resources/views/vendor/shop/customers/account/orders/view.blade.php vendored
View File

@ -86,7 +86,7 @@
<td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">
{{ $item->name }}
@if ($preOrderItem = $preOrderItemRepository->resetScope()->findOneByField('order_item_id', $item->id))
@if ($preOrderItem = $preOrderItemRepository->findOneByField('order_item_id', $item->id))
<div class="pre-order-item-info">
<span class="heading" @if($item->type == 'configurable')style="margin-top: 0"@endif>
{{ __('preorder::app.shop.sales.orders.preorder-information') }}
@ -114,7 +114,7 @@
</span>
@endif
</div>
@elseif ($preOrderItem = app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository')->resetScope()->findOneByField('payment_order_item_id', $item->id))
@elseif ($preOrderItem = app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository')->findOneByField('payment_order_item_id', $item->id))
<div class="pre-order-item-info">
<span class="heading" @if($item->type == 'configurable')style="margin-top: 0"@endif>
{{ __('preorder::app.shop.sales.orders.preorder-payment-information') }}
@ -411,4 +411,4 @@
</div>
@endsection
@endsection