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

Customer document migration fix

This commit is contained in:
Prashant Singh 2019-07-30 19:16:00 +05:30
parent 9b0c3456e5
commit 880827f6f4
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/CustomerDocument/src/Database/migrations/2019_06_07_122059_customer_documents_table.php
View File

@ -21,6 +21,8 @@ class CustomerDocumentsTable extends Migration
$table->string('type');
$table->string('path');
$table->integer('customer_id')->default(0);
$table->integer('company_id')->unsigned();
$table->foreign('company_id')->references('companies')->onDelete('cascade');
$table->timestamps();
});
}

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

@ -22,7 +22,7 @@
</div>
<div class="page-content">
@inject('orderGrid', 'Webkul\SAASPreOrder\DataGrids\Admin\Order')
@inject('orderGrid', 'Webkul\PreOrder\DataGrids\Admin\Order')
{!! $orderGrid->render() !!}
</div>

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

@ -31,7 +31,7 @@
</a>
@endif
@if ($order->canShip() && ! app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository')->isPreOrderPaymentOrder($order->id))
@if ($order->canShip() && ! app('Webkul\PreOrder\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>
@ -46,7 +46,7 @@
<div class="sale-container">
<?php
$preOrderItemRepository = app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository');
$preOrderItemRepository = app('Webkul\PreOrder\Repositories\PreOrderItemRepository');
$havePreOrderItems = $preOrderItemRepository->havePreOrderItems($order->id);
?>
@ -296,7 +296,7 @@
</span>
@endif
</div>
@elseif ($preOrderItem = app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository')->findOneByField('payment_order_item_id', $item->id))
@elseif ($preOrderItem = app('Webkul\PreOrder\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') }}

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

@ -31,7 +31,7 @@
<tab name="{{ __('shop::app.customer.account.order.view.info') }}" :selected="true">
<?php
$preOrderItemRepository = app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository');
$preOrderItemRepository = app('Webkul\PreOrder\Repositories\PreOrderItemRepository');
$havePreOrderItems = $preOrderItemRepository->havePreOrderItems($order->id);
?>
@ -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\PreOrder\Repositories\PreOrderItemRepository')->resetScope()->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') }}