From e33a374e676023b8489c9458e547d324e722870f Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Fri, 5 Jul 2019 11:18:11 +0530
Subject: [PATCH] Shop package views reste

---
 .../views/checkout/total/summary.blade.php    |   1 +
 .../customers/account/orders/view.blade.php   |  89 ++---------
 .../views/layouts/footer/footer.blade.php     | 138 +++++++++---------
 .../layouts/header/nav-menu/navmenu.blade.php |   4 +-
 4 files changed, 83 insertions(+), 149 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php
index 990b3f2e6..6c5e903e9 100755
--- a/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/checkout/total/summary.blade.php
@@ -36,6 +36,7 @@
         </label>
     </div>
 
+
     <div class="payable-amount" id="grand-total-detail">
         <label>{{ __('shop::app.checkout.total.grand-total') }}</label>
         <label class="right" id="grand-total-amount-detail">
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
index f77967460..04299ffdc 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
@@ -4,10 +4,6 @@
     {{ __('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">
@@ -30,16 +26,6 @@
                 <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">
@@ -82,57 +68,8 @@
                                                     <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.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.item-status') }}">
                                                         <span class="qty-row">
                                                             {{ __('shop::app.customer.account.order.view.item-ordered', ['qty_ordered' => $item->qty_ordered]) }}
@@ -150,22 +87,10 @@
                                                             {{ $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>
+                                                    <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>
@@ -188,6 +113,14 @@
                                                 <td>{{ core()->formatPrice($order->shipping_amount, $order->order_currency_code) }}</td>
                                             </tr>
 
+                                            @if ($order->base_discount_amount > 0)
+                                                <tr>
+                                                    <td>{{ __('shop::app.customer.account.order.view.discount') }}</td>
+                                                    <td>-</td>
+                                                    <td>{{ core()->formatPrice($order->discount_amount, $order->order_currency_code) }}</td>
+                                                </tr>
+                                            @endif
+
                                             <tr class="border">
                                                 <td>{{ __('shop::app.customer.account.order.view.tax') }}</td>
                                                 <td>-</td>
@@ -411,4 +344,4 @@
 
     </div>
 
-@endsection
+@endsection
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php
index 42be174e7..4eb458ef2 100755
--- a/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/footer/footer.blade.php
@@ -1,94 +1,94 @@
 <div class="footer">
-        <div class="footer-content">
-            <div class="footer-list-container">
+    <div class="footer-content">
+        <div class="footer-list-container">
 
-                <?php
-                    $categories = [];
+            <?php
+                $categories = [];
 
-                    foreach (app('Webkul\CustomerGroupCatalog\Repositories\CategoryRepository')->getVisibleCategoryTree(core()->getCurrentChannel()->root_category_id) as $category){
-                        if ($category->slug)
-                            array_push($categories, $category);
-                    }
-                ?>
+                foreach (app('Webkul\Category\Repositories\CategoryRepository')->getVisibleCategoryTree(core()->getCurrentChannel()->root_category_id) as $category){
+                    if ($category->slug)
+                        array_push($categories, $category);
+                }
+            ?>
 
-                @if (count($categories))
-                    <div class="list-container">
-                        <span class="list-heading">Categories</span>
+            @if (count($categories))
+                <div class="list-container">
+                    <span class="list-heading">Categories</span>
 
-                        <ul class="list-group">
-                            @foreach ($categories as $key => $category)
-                                <li>
-                                    <a href="{{ route('shop.categories.index', $category->slug) }}">{{ $category->name }}</a>
-                                </li>
-                            @endforeach
-                        </ul>
+                    <ul class="list-group">
+                        @foreach ($categories as $key => $category)
+                            <li>
+                                <a href="{{ route('shop.categories.index', $category->slug) }}">{{ $category->name }}</a>
+                            </li>
+                        @endforeach
+                    </ul>
+                </div>
+            @endif
+
+            {!! DbView::make(core()->getCurrentChannel())->field('footer_content')->render() !!}
+
+            <div class="list-container">
+                @if(core()->getConfigData('customer.settings.newsletter.subscription'))
+                    <span class="list-heading">{{ __('shop::app.footer.subscribe-newsletter') }}</span>
+                    <div class="form-container">
+                        <form action="{{ route('shop.subscribe') }}">
+                            <div class="control-group" :class="[errors.has('subscriber_email') ? 'has-error' : '']">
+                                <input type="email" class="control subscribe-field" name="subscriber_email" placeholder="Email Address" required><br/>
+
+                                <button class="btn btn-md btn-primary">{{ __('shop::app.subscription.subscribe') }}</button>
+                            </div>
+                        </form>
                     </div>
                 @endif
 
-                {!! DbView::make(core()->getCurrentChannel())->field('footer_content')->render() !!}
+                <?php
+                    $query = parse_url($_SERVER['REQUEST_URI'], PHP_URL_QUERY);
+                    $searchTerm = explode("?", $query);
 
-                <div class="list-container">
-                    @if(core()->getConfigData('customer.settings.newsletter.subscription'))
-                        <span class="list-heading">{{ __('shop::app.footer.subscribe-newsletter') }}</span>
-                        <div class="form-container">
-                            <form action="{{ route('shop.subscribe') }}">
-                                <div class="control-group" :class="[errors.has('subscriber_email') ? 'has-error' : '']">
-                                    <input type="email" class="control subscribe-field" name="subscriber_email" placeholder="Email Address" required><br/>
-
-                                    <button class="btn btn-md btn-primary">{{ __('shop::app.subscription.subscribe') }}</button>
-                                </div>
-                            </form>
-                        </div>
-                    @endif
-
-                    <?php
-                        $query = parse_url($_SERVER['REQUEST_URI'], PHP_URL_QUERY);
-                        $searchTerm = explode("?", $query);
-
-                        foreach($searchTerm as $term){
-                            if (strpos($term, 'term') !== false) {
-                                $serachQuery = $term;
-                            }
+                    foreach($searchTerm as $term){
+                        if (strpos($term, 'term') !== false) {
+                            $serachQuery = $term;
                         }
-                    ?>
+                    }
+                ?>
 
-                    <span class="list-heading">{{ __('shop::app.footer.locale') }}</span>
+                <span class="list-heading">{{ __('shop::app.footer.locale') }}</span>
+                <div class="form-container">
+                    <div class="control-group">
+                        <select class="control locale-switcher" onchange="window.location.href = this.value" @if (count(core()->getCurrentChannel()->locales) == 1) disabled="disabled" @endif>
+
+                            @foreach (core()->getCurrentChannel()->locales as $locale)
+                                @if(isset($serachQuery))
+                                    <option value="?{{ $serachQuery }}?locale={{ $locale->code }}" {{ $locale->code == app()->getLocale() ? 'selected' : '' }}>{{ $locale->name }}</option>
+                                @else
+                                    <option value="?locale={{ $locale->code }}" {{ $locale->code == app()->getLocale() ? 'selected' : '' }}>{{ $locale->name }}</option>
+                                @endif
+                            @endforeach
+
+                        </select>
+                    </div>
+                </div>
+
+                <div class="currency">
+                    <span class="list-heading">{{ __('shop::app.footer.currency') }}</span>
                     <div class="form-container">
                         <div class="control-group">
-                            <select class="control locale-switcher" onchange="window.location.href = this.value" @if (count(core()->getCurrentChannel()->locales) == 1) disabled="disabled" @endif>
+                            <select class="control locale-switcher" onchange="window.location.href = this.value">
 
-                                @foreach (core()->getCurrentChannel()->locales as $locale)
+                                @foreach (core()->getCurrentChannel()->currencies as $currency)
                                     @if(isset($serachQuery))
-                                        <option value="?{{ $serachQuery }}?locale={{ $locale->code }}" {{ $locale->code == app()->getLocale() ? 'selected' : '' }}>{{ $locale->name }}</option>
+                                        <option value="?{{ $serachQuery }}?currency={{ $currency->code }}" {{ $currency->code == core()->getCurrentCurrencyCode() ? 'selected' : '' }}>{{ $currency->code }}</option>
                                     @else
-                                        <option value="?locale={{ $locale->code }}" {{ $locale->code == app()->getLocale() ? 'selected' : '' }}>{{ $locale->name }}</option>
+                                        <option value="?currency={{ $currency->code }}" {{ $currency->code == core()->getCurrentCurrencyCode() ? 'selected' : '' }}>{{ $currency->code }}</option>
                                     @endif
                                 @endforeach
 
                             </select>
                         </div>
                     </div>
-
-                    <div class="currency">
-                        <span class="list-heading">{{ __('shop::app.footer.currency') }}</span>
-                        <div class="form-container">
-                            <div class="control-group">
-                                <select class="control locale-switcher" onchange="window.location.href = this.value">
-
-                                    @foreach (core()->getCurrentChannel()->currencies as $currency)
-                                        @if(isset($serachQuery))
-                                            <option value="?{{ $serachQuery }}?currency={{ $currency->code }}" {{ $currency->code == core()->getCurrentCurrencyCode() ? 'selected' : '' }}>{{ $currency->code }}</option>
-                                        @else
-                                            <option value="?currency={{ $currency->code }}" {{ $currency->code == core()->getCurrentCurrencyCode() ? 'selected' : '' }}>{{ $currency->code }}</option>
-                                        @endif
-                                    @endforeach
-
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-
                 </div>
+
             </div>
         </div>
-    </div>
\ No newline at end of file
+    </div>
+</div>
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/nav-menu/navmenu.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/nav-menu/navmenu.blade.php
index 6fb57040f..c0e357257 100755
--- a/packages/Webkul/Shop/src/Resources/views/layouts/header/nav-menu/navmenu.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/nav-menu/navmenu.blade.php
@@ -4,7 +4,7 @@
 
 $categories = [];
 
-foreach (app('Webkul\CustomerGroupCatalog\Repositories\CategoryRepository')->getVisibleCategoryTree(core()->getCurrentChannel()->root_category_id) as $category) {
+foreach (app('Webkul\Category\Repositories\CategoryRepository')->getVisibleCategoryTree(core()->getCurrentChannel()->root_category_id) as $category) {
     if ($category->slug)
         array_push($categories, $category);
 }
@@ -134,4 +134,4 @@ foreach (app('Webkul\CustomerGroupCatalog\Repositories\CategoryRepository')->get
 </script>
 
 
-@endpush
+@endpush
\ No newline at end of file