commit before test last checkout update process

app/Http/Controllers/PublicController.php

@@ -17,6 +17,7 @@ use App\Models\Category;
 use App\Models\Event;
 use App\Models\Slider;
 use App;
+use Illuminate\Mail\Markdown;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\DB;
 
@@ -52,6 +53,8 @@ class PublicController extends Controller
             'musical' => $musical,
             'sliders' => $sliders
         ]);
+
+        Markdown::parse();
     }
 
     public function showCategoryEvents($cat_id){
@@ -160,4 +163,8 @@ class PublicController extends Controller
                 'message' => trans('ClientSide.subscribe_error_message'),
             ]);
     }
+
+    public function venues(){
+
+    }
 }

public/assets/stylesheet/custom.css

@@ -1570,15 +1570,15 @@ tr.ver-space {
 #seats-form input:checked ~ label svg {
   fill: #d43d34; }
 
-#seats-form input:checked ~ label span {
+#seats-form input:checked ~ label span, #seats-form input:disabled ~ label span{
   color: #ffffff;
 }
 
 input.booked-seats ~ label svg {
-  fill: #6a687e; }
+  fill: #06b84d; }
 
 input.reserved-seats ~ label svg {
-  fill: #a4a4a4; }
+  fill: #4e5ced; }
 
 .seats-top-overlay {
   background-color: #d33d33;

resources/lang/en/ClientSide.php

@@ -103,6 +103,7 @@ return [
     'selected' => 'You Have Selected',
     'seatsTotal' => 'seats. Total cost',
     'yourSeats' => 'Your Seats',
+    'exceeds' => "You have exceeded maximum ticket count: ",
 
     //Chcekout page
     'checkout' => 'Checkout',

resources/lang/ru/ClientSide.php

@@ -103,6 +103,7 @@ return [
     'selected' => 'Вы выбрали',
     'seatsTotal' => 'мест. Общая стоимость',
     'yourSeats' => 'Ваши места',
+    'exceeds' => "Максимальное разрешенное количество билетов ",
 
     //CheckoutPage
     'confirm-seats' => 'Подтвердите ваши места',

resources/lang/tk/ClientSide.php

@@ -102,6 +102,7 @@ return [
     'selected' => 'Siz saýladyňyz',
     'seatsTotal' => 'ýeri. Umumy baha',
     'yourSeats' => 'Siziň ýerleriňiz',
+    'exceeds' => "Satyn almaga rugsat berilen biletleriň aňyrybaşy",
 
     //CheckoutPage
     'confirm-seats' => 'Saýlan ýerleriňizi tassyklaň',

resources/views/Shared/Partials/FilterMenu.blade.php

@@ -3,24 +3,18 @@
         <ul class="nav u-nav-v1-1 g-mb-20 category-filter" data-btn-classes="btn btn-md btn-block rounded-0 u-btn-outline-lightgray g-mb-20">
 
             <li class="nav-item">
-                <a class="nav-link active" href="{{$category->customUrl(['sort'=>'popular','start'=>$start,'end'=>$end])}}">{{__("ClientSide.popular")}}</a>
+                <a class="nav-link active" href="{{$category->customUrl(['start'=>now(),'end'=>today()->endOfDay()])}}">{{__("ClientSide.today")}}</a>
             </li>
             <li class="nav-item">
-                <a class="nav-link" href="{{$category->customUrl(['sort'=>'new','start'=>$start,'end'=>$end])}}">{{__('ClientSide.new')}}</a>
+                <a class="nav-link" href="{{$category->customUrl(['start'=>now()->endOfDay(),'end'=>Carbon::tomorrow()->endOfDay()])}}">{{__('ClientSide.tomorrow')}}</a>
             </li>
-            <li class="nav-item dropdown">
+            <li class="nav-item">
-                <a class="nav-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" role="tab">{{__('ClientSide.filter')}} <i class="fa fa-caret-down"></i></a>
+                <a class="nav-link" href="{{$category->customUrl(['start'=>now(),'end'=>today()->endOfWeek()])}}">{{__('ClientSide.week')}}</a>
-                <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-                    <a class="dropdown-item nav-link"
-                       href="{{$category->customUrl(['sort'=>$sort,'start'=>Carbon::now(),'end'=>Carbon::today()->endOfDay()])}}" >{{__('ClientSide.today')}}</a>
-                    <a class="dropdown-item nav-link"
-                       href="{{$category->customUrl(['sort'=>$sort,'start'=>Carbon::tomorrow(),'end'=>Carbon::tomorrow()->endOfDay()])}}" >{{__('ClientSide.tomorrow')}}</a>
-                    <a class="dropdown-item nav-link"
-                       href="{{$category->customUrl(['sort'=>$sort,'start'=>Carbon::now(),'end'=>Carbon::today()->endOfWeek()])}}" >{{__('ClientSide.week')}}</a>
-                    <a class="dropdown-item nav-link"
-                       href="{{$category->customUrl(['sort'=>$sort,'start'=>Carbon::now(),'end'=>Carbon::today()->endOfMonth()])}}" >{{__('ClientSide.month')}}</a>
-                </div>
             </li>
+            <li class="nav-item">
+                <a class="nav-link" href="{{$category->customUrl(['start'=>now(),'end'=>today()->endOfMonth()])}}">{{__('ClientSide.month')}}</a>
+            </li>
+
             <li class="nav-item dropdown" style="position: relative; margin-left: -20px;">
                 <form action="{{$category->url}}" method="post" class="calendar-form">
                     @csrf

resources/views/desktop/Pages/SeatsPage.blade.php

@@ -130,7 +130,7 @@
 
             if(checkedCount>max_seats){
                 $(this).prop("checked",false)
-                showMessage("You have excidid maximum ticket count: "+max_seats)
+                showMessage("@lang('ClientSide.exceeds')"+max_seats)
                 return;
             }
 

resources/views/mobile/Pages/SeatsPage.blade.php

@@ -11,7 +11,7 @@
                 <div class="pills-struct mt-5 w-100">
                     <ul role="tablist" class="nav nav-pills m-auto w-auto justify-content-center" id="choose_seats">
                         @foreach($tickets as $ticket)
-                            <li class="active" role="presentation" style="display: inline-block;">
+                            <li class="active mb-5" role="presentation" style="display: inline-block;">
                                 <a aria-expanded="true" data-toggle="tab" class="@if ($loop->first)active @endif show"
                                    role="tab" id="home_tab_{{$ticket->id}}" href="#home_{{$ticket->id}}" aria-selected="true">
                                     {{$ticket->title}} - {{$ticket->price}} TMT.