From 1ba925caf31e0cbfecf06f0fa778aaa1cfe6ce98 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Mon, 23 Dec 2019 13:14:47 +0300
Subject: [PATCH] base theme template completed for carts and orders module

---
 .../resources/views/new-ad/new-create.twig    |  2 +-
 .../base-theme/resources/css/theme.css        |  7 +-
 .../resources/views/partials/navigation.twig  | 25 ++++-
 .../Http/Controller/MyProfileController.php   | 91 -------------------
 .../src/ProfileModuleServiceProvider.php      | 10 --
 5 files changed, 27 insertions(+), 108 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
index f4c4af341..8f25cb3c6 100644
--- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
@@ -46,11 +46,11 @@
                                     <div class="col-md-12">
                                         {{ nameField|raw }}
                                     </div>
-                                    {{ addBlock('new-ad/fields')|raw }}
                                     <div style="display: none">
                                         {{ form.fields.slug|raw }}
                                     </div>
                                 </div>
+                                {{ addBlock('new-ad/fields')|raw }}
                                 <div class="row form-group select-price">
                                     <label class="col-sm-2 label-title col-xs-12">
                                         {{ form.fields.price.label|raw }}
diff --git a/addons/default/visiosoft/base-theme/resources/css/theme.css b/addons/default/visiosoft/base-theme/resources/css/theme.css
index ada034071..3ca4f04ee 100644
--- a/addons/default/visiosoft/base-theme/resources/css/theme.css
+++ b/addons/default/visiosoft/base-theme/resources/css/theme.css
@@ -1,6 +1,11 @@
 #main {
     margin: 3rem 0;
 }
-.hidden{
+
+.hidden {
     display: none;
+}
+
+.table-img-100 {
+    max-width: 100px;
 }
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/navigation.twig b/addons/default/visiosoft/base-theme/resources/views/partials/navigation.twig
index 17bcb7dcc..5830c8edd 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/navigation.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/navigation.twig
@@ -1,12 +1,12 @@
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
     <div class="container">
         <a class="navbar-brand" href="{{ url("/") }}">{{ setting_value('streams::name', config_get('streams::distribution.name')) }}</a>
-        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExample07"
-                aria-controls="navbarsExample07" aria-expanded="false" aria-label="Toggle navigation">
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarContent"
+                aria-controls="navbarContent" aria-expanded="false" aria-label="Toggle navigation">
             <span class="navbar-toggler-icon"></span>
         </button>
 
-        <div class="collapse navbar-collapse">
+        <div class="collapse navbar-collapse" id="navbarContent">
             {{ structure()
             .linkAttributesDropdown({'data-toggle': 'dropdown'})
             .item_class('nav-item')
@@ -20,8 +20,23 @@
             .childListClass('dropdown-menu')
             .cache({'namespace': 'user'})
             .render()|raw }}
+            <ul class="nav navbar-nav navbar-right d-block d-sm-none">
+                <li class="nav-item">
+                    {% if auth_check() %}
+                        <a class="nav-link" href="{{ url_route('anomaly.module.users::logout') }}">Logout</a>
+                    {% else %}
+                        <a class="nav-link" href="{{ url_route('anomaly.module.users::login') }}">Login</a>
+                    {% endif %}
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="{{ url_route('profile::profile') }}">Profile</a>
+                </li>
+                <li class="nav-item">
+                    <a href="/advs/create_adv" class="btn btn-primary">{{ trans("theme::button.post_ad.name") }}</a>
+                </li>
+            </ul>
         </div>
-        <div>
+        <div class="d-none d-sm-block">
             <ul class="nav navbar-nav navbar-right">
                 <li class="nav-item">
                     {% if auth_check() %}
@@ -31,7 +46,7 @@
                     {% endif %}
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link" href="{{ url_route('visiosoft.module.profile::profile') }}">Profile</a>
+                    <a class="nav-link" href="{{ url_route('profile::profile') }}">Profile</a>
                 </li>
                 <li class="nav-item">
                     <a href="/advs/create_adv" class="btn btn-primary">{{ trans("theme::button.post_ad.name") }}</a>
diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
index 3c8d45254..bc8aec83e 100644
--- a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
+++ b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
@@ -68,8 +68,6 @@ class MyProfileController extends PublicController
 
         $isActive = new AdvModel();
         $isActiveMessages = $isActive->is_enabled('messages');
-        $isActiveOrders = $isActive->is_enabled('orders');
-        $isBalanceActive = $isActive->is_enabled('balances');
         $isActivePackages = $isActive->is_enabled('packages');
 
 
@@ -86,19 +84,6 @@ class MyProfileController extends PublicController
             $menu_fields[] = $menu_messages;
         }
 
-        if ($isActiveOrders) {
-            $advModel = new AdvModel();
-            $OrderModel = new OrderModel();
-            $OrderDetailModel = new OrderdetailModel();
-            $myPurchase = $OrderModel->listMyOrders();
-            $mySales = $OrderDetailModel->listMySales();
-            foreach ($mySales as $index => $mySale) {
-                if ($mySale->item_type == 'adv') {
-                    $mySales[$index]->detail_url = $advModel->getAdvDetailLinkByAdId($mySale->item_id);
-                }
-                $mySales[$index]->detail_url = "#";
-            }
-        }
 
         $advs_count = new AdvModel();
         $advs_count = count($advs_count->myAdvsByUser()->get());
@@ -341,82 +326,6 @@ class MyProfileController extends PublicController
         return redirect('/');
     }
 
-    public function orderDetail($id)
-    {
-        $advModel = new AdvModel();
-        $orderDetailModel = new OrderdetailModel();
-        $details = $orderDetailModel->getDetail($id);
-        foreach ($details as $index => $detail) {
-            if ($detail->item_type == "adv") {
-                $details[$index]->detail_url = $advModel->getAdvDetailLinkByAdId($detail->item_id);
-            } else {
-                $details[$index]->detail_url = "#";
-            }
-        }
-        return $this->view->make('visiosoft.module.profile::profile.show-order', compact('details'));
-    }
-
-    public function saleDetail($id)
-    {
-        $advModel = new AdvModel();
-        $orderDetailModel = new OrderdetailModel();
-        $details = $orderDetailModel->getOrder($id);
-        if ($details->item_type == "adv") {
-            $details->detail_url = $advModel->getAdvDetailLinkByAdId($details->item_id);
-        } else {
-            $details->detail_url = "#";
-        }
-        return $this->view->make('visiosoft.module.profile::profile.show-my-sale', compact('details'));
-    }
-
-    public function addTrackingNumber(Request $request, OrderdetailRepository $orderdetailRepository)
-    {
-        $orderdetailRepository->addTransportnumber($request->id, $request->transportNumber, $request->transportDays);
-        return back()->with('success', ['Success']);
-    }
-
-    public function orderDelivered($id)
-    {
-        $orderDetailModel = new OrderdetailModel();
-        $details = $orderDetailModel->status($id, 'paid_buyer');
-        $orderPaymentModel = new OrderpaymentModel();
-        $orderPaymentModel->addSalesPayment($id);
-        return back()->with('success', [trans('visiosoft.module.profile::message.success')]);
-    }
-
-    public function orderNotDelivered($id)
-    {
-        $orderDetailModel = new OrderdetailModel();
-        $details = $orderDetailModel->status($id, 'error_buyer');
-        return back()->with('success', [trans('visiosoft.module.profile::message.success')]);
-    }
-
-    public function reportSales(Request $request, OrderdetailRepository $orderdetailRepository, Dispatcher $events)
-    {
-        if ($request->status == 'sendAgain') {
-            $seller = Auth::user();
-            $buyer = $orderdetailRepository->getOrderUser($request->id);
-            $orderdetailRepository->report($request->id, $request->reportContent, 'awaiting_tracking_number');
-
-            $events->dispatch(new AgainPurchaseOrder($request->reportContent, $buyer));
-            $events->dispatch(new AgainSaleOrder($request->reportContent, $seller));
-
-//                $buyer->notify(new AgainPuchaseOrder($request->reportContent, $buyer['display_name']));/*notify*/
-//                $seller->notify(new AgainSaleOrder($request->reportContent, $seller['display_name']));/*notify*/
-
-        } else {
-            $orderdetailRepository->report($request->id, $request->reportContent);
-            $user = $orderdetailRepository->getOrderUser($request->id);
-            $orderPaymentModel = new OrderpaymentModel();
-            $orderPaymentModel->addCancelPayment($request->id, $request->reportContent);
-
-            $events->dispatch(new ReportOrder($request->reportContent, $user));
-//                $user->notify(new ReportOrder($request->reportContent, $user['display_name']));/*notify*/
-
-        }
-        return back()->with('success', [trans('visiosoft.module.profile::message.success')]);
-    }
-
     public function notification(Request $request)
     {
         $all = $request->all();
diff --git a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php
index a833046c0..b39eccea2 100644
--- a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php
+++ b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php
@@ -110,16 +110,6 @@ class ProfileModuleServiceProvider extends AddonServiceProvider
         'profile/class/extendTime/{id},{type}' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@extendAds',
         'profile/message/show/{id}' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@showMessage',
         'profile/closeAccount' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@disableAccount',
-
-        'profile/order/{id}' => [
-            'as' => 'visiosoft.module.profile::profile_order',
-            'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@orderDetail'
-        ],
-        'profile/my-sale/{id}' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@saleDetail',
-        'profile/orders/add-transport-number' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@addTrackingNumber',
-        'profile/orders/delivered-purchase/{id}' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@orderDelivered',
-        'profile/orders/not-delivered-purchase/{id}' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@orderNotDelivered',
-        'profile/orders/report-sales' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@reportSales',
         'profile/notification' => [
             'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@notification',
         ],