From 2ce18e5a494c6d76e5ab0903d4aa174f23c83c2c Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Tue, 2 Jul 2019 14:23:21 +0530
Subject: [PATCH] Placing the conflicted files of show price after login and
 preorder to the actual paths instead of altering the original shop package
 view files

---
 .../Providers/SAASPreorderServiceProvider.php |   2 +-
 .../customers/account/orders/view.blade.php   | 414 ++++++++++++++++++
 .../shop/products/add-buttons.blade.php       |  36 ++
 .../shop/products/view/product-add.blade.php  |  25 ++
 4 files changed, 476 insertions(+), 1 deletion(-)
 create mode 100755 resources/views/vendor/shop/customers/account/orders/view.blade.php
 create mode 100644 resources/views/vendor/shop/products/add-buttons.blade.php
 create mode 100644 resources/views/vendor/shop/products/view/product-add.blade.php

diff --git a/packages/Webkul/SAASPreOrder/src/Providers/SAASPreorderServiceProvider.php b/packages/Webkul/SAASPreOrder/src/Providers/SAASPreorderServiceProvider.php
index b8fa8cee7..2c8969e30 100755
--- a/packages/Webkul/SAASPreOrder/src/Providers/SAASPreorderServiceProvider.php
+++ b/packages/Webkul/SAASPreOrder/src/Providers/SAASPreorderServiceProvider.php
@@ -42,7 +42,7 @@ class SAASPreOrderServiceProvider extends ServiceProvider
             // __DIR__ . '/../Resources/views/shop/products/view/product-add.blade.php' => resource_path('views/vendor/shop/products/view/product-add.blade.php'),
 
             __DIR__ . '/../Resources/views/admin/sales/orders' => resource_path('views/vendor/admin/sales/orders'),
-            // __DIR__ . '/../Resources/views/shop/customers/account/orders' => resource_path('views/vendor/shop/customers/account/orders'),
+            __DIR__ . '/../Resources/views/shop/customers/account/orders' => resource_path('views/vendor/shop/customers/account/orders'),
         ]);
 
         //model observer for all the core models of Bagisto
diff --git a/resources/views/vendor/shop/customers/account/orders/view.blade.php b/resources/views/vendor/shop/customers/account/orders/view.blade.php
new file mode 100755
index 000000000..f77967460
--- /dev/null
+++ b/resources/views/vendor/shop/customers/account/orders/view.blade.php
@@ -0,0 +1,414 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->id]) }}
+@endsection
+
+@push('css')
+    <link rel="stylesheet" href="{{ asset('vendor/webkul/preorder/assets/css/preorder.css') }}">
+@endpush
+
+@section('content-wrapper')
+
+    <div class="account-content">
+        @include('shop::customers.account.partials.sidemenu')
+
+        <div class="account-layout">
+
+            <div class="account-head">
+                <span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>
+                <span class="account-heading">
+                    {{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->id]) }}
+                </span>
+                <span></span>
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.account.orders.view.before', ['order' => $order]) !!}
+
+            <div class="sale-container">
+
+                <tabs>
+                    <tab name="{{ __('shop::app.customer.account.order.view.info') }}" :selected="true">
+
+                        <?php
+                            $preOrderItemRepository = app('Webkul\SAASPreOrder\Repositories\PreOrderItemRepository');
+
+                            $havePreOrderItems = $preOrderItemRepository->havePreOrderItems($order->id);
+                        ?>
+
+                        @if ($havePreOrderItems)
+                            <div class="preorder-info">{{ __('preorder::app.shop.sales.orders.preorder-summary') }}</div>
+                        @endif
+
+                        <div class="sale-section">
+                            <div class="section-content">
+                                <div class="row">
+                                    <span class="title">
+                                        {{ __('shop::app.customer.account.order.view.placed-on') }}
+                                    </span>
+
+                                    <span class="value">
+                                        {{ core()->formatDate($order->created_at, 'd M Y') }}
+                                    </span>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="sale-section">
+                            <div class="secton-title">
+                                <span>{{ __('shop::app.customer.account.order.view.products-ordered') }}</span>
+                            </div>
+
+                            <div class="section-content">
+                                <div class="table">
+                                    <table>
+                                        <thead>
+                                            <tr>
+                                                <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.price') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.item-status') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.subtotal') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.tax-percent') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.tax-amount') }}</th>
+                                                <th>{{ __('shop::app.customer.account.order.view.grand-total') }}</th>
+                                            </tr>
+                                        </thead>
+
+                                        <tbody>
+
+                                            @foreach ($order->items as $item)
+                                                <tr>
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}">
+                                                        {{ $item->type == 'configurable' ? $item->child->sku : $item->sku }}
+                                                    </td>
+
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">
+                                                        {{ $item->name }}
+
+                                                        @if ($preOrderItem = $preOrderItemRepository->resetScope()->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') }}
+                                                                </span>
+
+                                                                <span class="row">
+                                                                    <b>{{ __('preorder::app.shop.sales.orders.type') }}</b>
+
+                                                                    {{ $preOrderItem->type_label }}
+                                                                </span>
+
+                                                                <span class="row">
+                                                                    <b>{{ __('preorder::app.shop.sales.orders.status') }}</b>
+
+                                                                    {{ $preOrderItem->status_label }}
+                                                                </span>
+
+                                                                @if ($preOrderItem->payment_order_item)
+                                                                    <span class="row">
+                                                                        <b>{{ __('preorder::app.shop.sales.orders.payment-order') }}</b>
+
+                                                                        <a href="{{ route('customer.orders.view', $preOrderItem->payment_order_item->order_id) }}" target="_blank">
+                                                                            #{{ $preOrderItem->payment_order_item->order_id }}
+                                                                        </a>
+                                                                    </span>
+                                                                @endif
+                                                            </div>
+                                                        @elseif ($preOrderItem = app('Webkul\SAASPreOrder\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') }}
+                                                                </span>
+
+                                                                <span class="row">
+                                                                    <b>{{ __('preorder::app.shop.sales.orders.reference-order') }}</b>
+
+                                                                    <a href="{{ route('customer.orders.view', $preOrderItem->order_id) }}" target="_blank">
+                                                                        #{{ $preOrderItem->order_id }}
+                                                                    </a>
+                                                                </span>
+                                                            </div>
+                                                        @endif
+                                                    </td>
+
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.price') }}">{{ core()->formatPrice($item->price, $order->order_currency_code) }}</td>
+
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.item-status') }}">
+                                                        <span class="qty-row">
+                                                            {{ __('shop::app.customer.account.order.view.item-ordered', ['qty_ordered' => $item->qty_ordered]) }}
+                                                        </span>
+
+                                                        <span class="qty-row">
+                                                            {{ $item->qty_invoiced ? __('shop::app.customer.account.order.view.item-invoice', ['qty_invoiced' => $item->qty_invoiced]) : '' }}
+                                                        </span>
+
+                                                        <span class="qty-row">
+                                                            {{ $item->qty_shipped ? __('shop::app.customer.account.order.view.item-shipped', ['qty_shipped' => $item->qty_shipped]) : '' }}
+                                                        </span>
+
+                                                        <span class="qty-row">
+                                                            {{ $item->qty_canceled ? __('shop::app.customer.account.order.view.item-canceled', ['qty_canceled' => $item->qty_canceled]) : '' }}
+                                                        </span>
+                                                    </td>
+
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.subtotal') }}">{{ core()->formatPrice($item->total, $order->order_currency_code) }}</td>
+
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.tax-percent') }}">{{ number_format($item->tax_percent, 2) }}%</td>
+
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.tax-amount') }}">{{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}</td>
+
+                                                    <td data-value="{{ __('shop::app.customer.account.order.view.grand-total') }}">
+                                                        {{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }}
+
+                                                        <?php $canBeComplete = $preOrderItemRepository->canBeComplete($item); ?>
+
+                                                        @if ($canBeComplete)
+                                                            <a href="{{ route('preorder.shop.preorder.complete', $preOrderItem->token) }}" style="margin-top: 5px" class="btn btn-primary btn-sm">Complete Preorder</a>
+                                                        @endif
+                                                    </td>
+                                                </tr>
+                                            @endforeach
+                                        </tbody>
+
+                                    </table>
+                                </div>
+
+                                <div class="totals">
+                                    <table class="sale-summary">
+                                        <tbody>
+                                            <tr>
+                                                <td>{{ __('shop::app.customer.account.order.view.subtotal') }}</td>
+                                                <td>-</td>
+                                                <td>{{ core()->formatPrice($order->sub_total, $order->order_currency_code) }}</td>
+                                            </tr>
+
+                                            <tr>
+                                                <td>{{ __('shop::app.customer.account.order.view.shipping-handling') }}</td>
+                                                <td>-</td>
+                                                <td>{{ core()->formatPrice($order->shipping_amount, $order->order_currency_code) }}</td>
+                                            </tr>
+
+                                            <tr class="border">
+                                                <td>{{ __('shop::app.customer.account.order.view.tax') }}</td>
+                                                <td>-</td>
+                                                <td>{{ core()->formatPrice($order->tax_amount, $order->order_currency_code) }}</td>
+                                            </tr>
+
+                                            <tr class="bold">
+                                                <td>{{ __('shop::app.customer.account.order.view.grand-total') }}</td>
+                                                <td>-</td>
+                                                <td>{{ core()->formatPrice($order->grand_total, $order->order_currency_code) }}</td>
+                                            </tr>
+
+                                            <tr class="bold">
+                                                <td>{{ __('shop::app.customer.account.order.view.total-paid') }}</td>
+                                                <td>-</td>
+                                                <td>{{ core()->formatPrice($order->grand_total_invoiced, $order->order_currency_code) }}</td>
+                                            </tr>
+
+                                            <tr class="bold">
+                                                <td>{{ __('shop::app.customer.account.order.view.total-refunded') }}</td>
+                                                <td>-</td>
+                                                <td>{{ core()->formatPrice($order->grand_total_refunded, $order->order_currency_code) }}</td>
+                                            </tr>
+
+                                            <tr class="bold">
+                                                <td>{{ __('shop::app.customer.account.order.view.total-due') }}</td>
+                                                <td>-</td>
+                                                <td>{{ core()->formatPrice($order->total_due, $order->order_currency_code) }}</td>
+                                            </tr>
+                                        <tbody>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                    </tab>
+
+                    @if ($order->invoices->count())
+                        <tab name="{{ __('shop::app.customer.account.order.view.invoices') }}">
+
+                            @foreach ($order->invoices as $invoice)
+
+                                <div class="sale-section">
+                                    <div class="secton-title">
+                                        <span>{{ __('shop::app.customer.account.order.view.individual-invoice', ['invoice_id' => $invoice->id]) }}</span>
+
+                                        <a href="{{ route('customer.orders.print', $invoice->id) }}" class="pull-right">
+                                            {{ __('shop::app.customer.account.order.view.print') }}
+                                        </a>
+                                    </div>
+
+                                    <div class="section-content">
+                                        <div class="table">
+                                            <table>
+                                                <thead>
+                                                    <tr>
+                                                        <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.price') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.subtotal') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.tax-amount') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.grand-total') }}</th>
+                                                    </tr>
+                                                </thead>
+
+                                                <tbody>
+
+                                                    @foreach ($invoice->items as $item)
+                                                        <tr>
+                                                            <td data-value="{{ __('shop::app.customer.account.order.view.SKU') }}">{{ $item->child ? $item->child->sku : $item->sku }}</td>
+                                                            <td data-value="{{ __('shop::app.customer.account.order.view.product-name') }}">{{ $item->name }}</td>
+                                                            <td data-value="{{ __('shop::app.customer.account.order.view.price') }}">{{ core()->formatPrice($item->price, $order->order_currency_code) }}</td>
+                                                            <td data-value="{{ __('shop::app.customer.account.order.view.qty') }}">{{ $item->qty }}</td>
+                                                            <td data-value="{{ __('shop::app.customer.account.order.view.subtotal') }}">{{ core()->formatPrice($item->total, $order->order_currency_code) }}</td>
+                                                            <td data-value="{{ __('shop::app.customer.account.order.view.tax-amount') }}">{{ core()->formatPrice($item->tax_amount, $order->order_currency_code) }}</td>
+                                                            <td data-value="{{ __('shop::app.customer.account.order.view.grand-total') }}">{{ core()->formatPrice($item->total + $item->tax_amount, $order->order_currency_code) }}</td>
+                                                        </tr>
+                                                    @endforeach
+                                                </tbody>
+                                            </table>
+                                        </div>
+
+                                        <div class="totals">
+                                            <table class="sale-summary">
+                                                <tr>
+                                                    <td>{{ __('shop::app.customer.account.order.view.subtotal') }}</td>
+                                                    <td>-</td>
+                                                    <td>{{ core()->formatPrice($invoice->sub_total, $order->order_currency_code) }}</td>
+                                                </tr>
+
+                                                <tr>
+                                                    <td>{{ __('shop::app.customer.account.order.view.shipping-handling') }}</td>
+                                                    <td>-</td>
+                                                    <td>{{ core()->formatPrice($invoice->shipping_amount, $order->order_currency_code) }}</td>
+                                                </tr>
+
+                                                <tr>
+                                                    <td>{{ __('shop::app.customer.account.order.view.tax') }}</td>
+                                                    <td>-</td>
+                                                    <td>{{ core()->formatPrice($invoice->tax_amount, $order->order_currency_code) }}</td>
+                                                </tr>
+
+                                                <tr class="bold">
+                                                    <td>{{ __('shop::app.customer.account.order.view.grand-total') }}</td>
+                                                    <td>-</td>
+                                                    <td>{{ core()->formatPrice($invoice->grand_total, $order->order_currency_code) }}</td>
+                                                </tr>
+                                            </table>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            @endforeach
+
+                        </tab>
+                    @endif
+
+                    @if ($order->shipments->count())
+                        <tab name="{{ __('shop::app.customer.account.order.view.shipments') }}">
+
+                            @foreach ($order->shipments as $shipment)
+
+                                <div class="sale-section">
+                                    <div class="secton-title">
+                                        <span>{{ __('shop::app.customer.account.order.view.individual-shipment', ['shipment_id' => $shipment->id]) }}</span>
+                                    </div>
+
+                                    <div class="section-content">
+
+                                        <div class="table">
+                                            <table>
+                                                <thead>
+                                                    <tr>
+                                                        <th>{{ __('shop::app.customer.account.order.view.SKU') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.product-name') }}</th>
+                                                        <th>{{ __('shop::app.customer.account.order.view.qty') }}</th>
+                                                    </tr>
+                                                </thead>
+
+                                                <tbody>
+
+                                                    @foreach ($shipment->items as $item)
+
+                                                        <tr>
+                                                            <td data-value="{{  __('shop::app.customer.account.order.view.SKU') }}">{{ $item->sku }}</td>
+                                                            <td data-value="{{  __('shop::app.customer.account.order.view.product-name') }}">{{ $item->name }}</td>
+                                                            <td data-value="{{  __('shop::app.customer.account.order.view.qty') }}">{{ $item->qty }}</td>
+                                                        </tr>
+
+                                                    @endforeach
+
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    </div>
+                                </div>
+
+                            @endforeach
+
+                        </tab>
+                    @endif
+                </tabs>
+
+                <div class="sale-section">
+                    <div class="section-content" style="border-bottom: 0">
+                        <div class="order-box-container">
+                            <div class="box">
+                                <div class="box-title">
+                                    {{ __('shop::app.customer.account.order.view.shipping-address') }}
+                                </div>
+
+                                <div class="box-content">
+
+                                    @include ('admin::sales.address', ['address' => $order->billing_address])
+
+                                </div>
+                            </div>
+
+                            <div class="box">
+                                <div class="box-title">
+                                    {{ __('shop::app.customer.account.order.view.billing-address') }}
+                                </div>
+
+                                <div class="box-content">
+
+                                    @include ('admin::sales.address', ['address' => $order->shipping_address])
+
+                                </div>
+                            </div>
+
+                            <div class="box">
+                                <div class="box-title">
+                                    {{ __('shop::app.customer.account.order.view.shipping-method') }}
+                                </div>
+
+                                <div class="box-content">
+
+                                    {{ $order->shipping_title }}
+
+                                </div>
+                            </div>
+
+                            <div class="box">
+                                <div class="box-title">
+                                    {{ __('shop::app.customer.account.order.view.payment-method') }}
+                                </div>
+
+                                <div class="box-content">
+                                    {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+
+            {!! view_render_event('bagisto.shop.customers.account.orders.view.after', ['order' => $order]) !!}
+
+        </div>
+
+    </div>
+
+@endsection
diff --git a/resources/views/vendor/shop/products/add-buttons.blade.php b/resources/views/vendor/shop/products/add-buttons.blade.php
new file mode 100644
index 000000000..76d0a7409
--- /dev/null
+++ b/resources/views/vendor/shop/products/add-buttons.blade.php
@@ -0,0 +1,36 @@
+@if ($product->type != "configurable" && $product->totalQuantity() < 1 && $product->allow_preorder)
+    @if (core()->getConfigData('preorder.settings.general.percent'))
+        @if (core()->getConfigData('preorder.settings.general.preorder_type') == 'partial')
+            <p>{{ __('preorder::app.shop.products.percent-to-pay', ['percent' => core()->getConfigData('preorder.settings.general.percent')]) }}</p>
+        @endif
+    @else
+        <p>{{ __('preorder::app.shop.products.nothing-to-pay') }}</p>
+    @endif
+@endif
+
+@if ($product->type == "configurable")
+    <div class="cart-wish-wrap">
+        <a href="{{ route('cart.add.configurable', $product->url_key) }}" class="btn btn-lg btn-primary addtocart">
+            {{ __('shop::app.products.add-to-cart') }}
+        </a>
+
+        @include('shop::products.wishlist')
+    </div>
+@else
+    <div class="cart-wish-wrap">
+        <form action="{{ route('cart.add', $product->product_id) }}" method="POST">
+            @csrf
+            <input type="hidden" name="product" value="{{ $product->product_id }}">
+            <input type="hidden" name="quantity" value="1">
+            <input type="hidden" value="false" name="is_configurable">
+
+            @if ($product->totalQuantity() < 1 && $product->allow_preorder)
+                <button class="btn btn-lg btn-primary addtocart">{{ __('preorder::app.shop.products.preorder') }}</button>
+            @else
+                <button class="btn btn-lg btn-primary addtocart" {{ $product->haveSufficientQuantity(1) ? '' : 'disabled' }}>{{ __('shop::app.products.add-to-cart') }}</button>
+            @endif
+        </form>
+
+        @include('shop::products.wishlist')
+    </div>
+@endif
\ No newline at end of file
diff --git a/resources/views/vendor/shop/products/view/product-add.blade.php b/resources/views/vendor/shop/products/view/product-add.blade.php
new file mode 100644
index 000000000..1903ae6ba
--- /dev/null
+++ b/resources/views/vendor/shop/products/view/product-add.blade.php
@@ -0,0 +1,25 @@
+{!! view_render_event('bagisto.shop.products.view.product-add.after', ['product' => $product]) !!}
+
+<div class="add-to-buttons">
+    @if ($product->type != 'configurable')
+        @if ($product->totalQuantity() < 1 && $product->allow_preorder)
+            <button type="submit" class="btn btn-lg btn-primary addtocart" style="width: 100%">
+                {{ __('preorder::app.shop.products.preorder') }}
+            </button>
+        @else
+            @include ('shop::products.add-to-cart', ['product' => $product])
+
+            @include ('shop::products.buy-now')
+        @endif
+    @else
+        @include ('shop::products.add-to-cart', ['product' => $product])
+
+        @include ('shop::products.buy-now')
+
+        <button type="submit" class="btn btn-lg btn-primary pre-order-btn" style="width: 100%; display: none;">
+            {{ __('preorder::app.shop.products.preorder') }}
+        </button>
+    @endif
+</div>
+
+{!! view_render_event('bagisto.shop.products.view.product-add.after', ['product' => $product]) !!}
\ No newline at end of file