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

Preorder path fixes after updation

This commit is contained in:
Prashant Singh 2019-06-29 18:35:27 +05:30
parent da29f58531
commit e7e9c24451
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/Webkul/CustomerDocument/src/Resources/views/admin/customers/upload.blade.php
View File

@ -6,6 +6,16 @@ $documents = $customerDocumentRepository->findWhere(['customer_id' => $customer-
?>
@section('css')
@parent
<style>
.modal-container {
top: 20px !important;
}
</style>
@stop
<accordian :title="'{{ __('customerdocument::app.admin.customers.documents') }}'" :active="true">
<div slot="body">

2
packages/Webkul/SAASPreOrder/src/Repositories/PreOrderItemRepository.php
View File

@ -20,7 +20,7 @@ class PreOrderItemRepository extends Repository
function model()
{
return 'Webkul\PreOrder\Contracts\PreOrderItem';
return 'Webkul\SAASPreOrder\Contracts\PreOrderItem';
}
/**

6
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\PreOrder\Repositories\PreOrderItemRepository')->findOneByField('payment_order_item_id', $item->id))
@if ($order->canShip() && ! app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository')->findOneByField('payment_order_item_id', $item->id))
<a href="{{ route('admin.sales.shipments.create', $order->id) }}" class="btn btn-lg btn-primary">
{{ __('admin::app.sales.orders.shipment-btn-title') }}
</a>
@ -46,7 +46,7 @@
<div class="sale-container">
<?php
$preOrderItemRepository = app('Webkul\PreOrder\Repositories\PreOrderItemRepository');
$preOrderItemRepository = app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository');
$havePreOrderItems = $preOrderItemRepository->havePreOrderItems($order->id);
?>
@ -296,7 +296,7 @@
</span>
@endif
</div>
@elseif ($preOrderItem = app('Webkul\PreOrder\Repositories\PreOrderItemRepository')->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.admin.sales.orders.preorder-payment-information') }}