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

git add .

This commit is contained in:
Prashant Singh 2019-06-29 20:40:28 +05:30
parent 1c1dc3c834
commit 07e90ae0f4
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.env.example
View File

@ -1,18 +1,18 @@
APP_NAME=Razzo APP_NAME=Razzo
APP_ENV=local APP_ENV=local
APP_VERSION=0.1.6 APP_VERSION=0.1.6
APP_KEY=base64:uHLkdcrc7RN8pzmDeJNtZrHCI6NmuCXETdocCr1ogAY= APP_KEY=
APP_DEBUG=true APP_DEBUG=true
APP_URL=http://bagsaas.com APP_URL=http://yourdomain.com
LOG_CHANNEL=stack LOG_CHANNEL=stack
DB_CONNECTION=mysql DB_CONNECTION=mysql
DB_HOST=127.0.0.1 DB_HOST=127.0.0.1
DB_PORT=3306 DB_PORT=3306
DB_DATABASE=bagsaas1 DB_DATABASE=
DB_USERNAME=root DB_USERNAME=
DB_PASSWORD=12345678 DB_PASSWORD=
BROADCAST_DRIVER=log BROADCAST_DRIVER=log
CACHE_DRIVER=file CACHE_DRIVER=file
@ -31,8 +31,8 @@ MAIL_USERNAME=
MAIL_PASSWORD= MAIL_PASSWORD=
MAIL_ENCRYPTION=tls MAIL_ENCRYPTION=tls
SHOP_MAIL_FROM=shop@bagsaas.com SHOP_MAIL_FROM=
ADMIN_MAIL_TO=admin@bagsaas.com ADMIN_MAIL_TO=
STRIPE_ENABLE_TESTING= STRIPE_ENABLE_TESTING=
STRIPE_TEST_PUBLISHABLE_KEY= STRIPE_TEST_PUBLISHABLE_KEY=

2
packages/Webkul/SAASPreOrder/src/DataGrids/Admin/Order.php
View File

@ -142,7 +142,7 @@ class Order extends DataGrid
'index' => 'is_preorder', 'index' => 'is_preorder',
'label' => trans('preorder::app.datagrid.order-type'), 'label' => trans('preorder::app.datagrid.order-type'),
'type' => 'string', 'type' => 'string',
'searchable' => true, 'searchable' => false,
'sortable' => true, 'sortable' => true,
'filterable' => true, 'filterable' => true,
'wrapper' => function ($row) { 'wrapper' => function ($row) {

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

@ -27,9 +27,9 @@ class PreOrderItemRepository extends Repository
* @param integer $orderId * @param integer $orderId
* @return boolean * @return boolean
*/ */
public function havePreOrderItems($orderId) public function isPreOrderPaymentOrder($orderId)
{ {
return $this->scopeQuery(function ($query) use ($orderId) { return $this->resetScope()->scopeQuery(function ($query) use ($orderId) {
return $query->leftJoin('order_items', 'pre_order_items.payment_order_item_id', '=', 'order_items.id') return $query->leftJoin('order_items', 'pre_order_items.payment_order_item_id', '=', 'order_items.id')
->leftJoin('orders', 'order_items.order_id', '=', 'orders.id') ->leftJoin('orders', 'order_items.order_id', '=', 'orders.id')
->where('orders.id', $orderId); ->where('orders.id', $orderId);
@ -40,9 +40,9 @@ class PreOrderItemRepository extends Repository
* @param integer $orderId * @param integer $orderId
* @return boolean * @return boolean
*/ */
public function isPreOrderPaymentOrder($orderId) public function havePreOrderItems($orderId)
{ {
return $this->scopeQuery(function ($query) use ($orderId) { return $this->resetScope()->scopeQuery(function ($query) use ($orderId) {
return $query->where('pre_order_items.order_id', $orderId); return $query->where('pre_order_items.order_id', $orderId);
})->count(); })->count();
} }

2
packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
View File

@ -86,7 +86,7 @@
<td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}"> <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">
{{ $item->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"> <div class="pre-order-item-info">
<span class="heading" @if($item->type == 'configurable')style="margin-top: 0"@endif> <span class="heading" @if($item->type == 'configurable')style="margin-top: 0"@endif>
{{ __('preorder::app.shop.sales.orders.preorder-information') }} {{ __('preorder::app.shop.sales.orders.preorder-information') }}