from server repaired

plugins/ahmadfatoni/apigenerator/controllers/api/BlogPostsApiController.php

@@ -18,6 +18,7 @@ use TPS\Birzha\Models\Favourites;
 use TPS\Birzha\Models\Notification;
 use TPS\Birzha\Models\Comment;
 use TPS\Birzha\Models\Sections;
+use TPS\Birzha\Models\Category;
 use RainLab\User\Models\User;
 
 class BlogPostsApiController extends Controller
@@ -35,6 +36,33 @@ class BlogPostsApiController extends Controller
         $this->helpers = $helpers;
     }
     
+    
+    public function getCategoryDatas(Request $request)
+    {
+        $path = 'https://gurlushyk.com.tm' . Config::get('cms.storage.media.path');
+        
+        $data = $request->all();
+        
+       
+        
+        $accounts = Category::select("id","name", "icon", "is_file_category", "primary_key")->where('id', $data["category"])->with("users:id,name,email,username,type,logo,shop_title,slogan,work_time,short_description,is_instagram")->get();
+        
+        $banners = Category::select("id","name", "icon", "is_file_category", "primary_key")->where('id', $data["category"])->with(["users" => function($q){
+                                                                                                                                    $q->where("is_category", 1)->select("category_id", "user_id", "logo", "banner", "is_instagram");
+                                                                                                                                }])->get();
+        
+        
+        $data = array(
+                "path" => $path,
+                "accounts" => $accounts,
+                "banners" => $banners
+            );
+        
+
+        
+        return response()->json(array("data"=>$data), 200);
+    }
+    
      public function home(){
         
         $path = 'https://gurlushyk.com.tm' . Config::get('cms.storage.media.path');
@@ -69,7 +97,7 @@ class BlogPostsApiController extends Controller
                 
             }else if ($dataq->sections[$i]->section_type == "TPS\Birzha\Models\Product") {
                 
-               $modified = $dataq->sections[$i]->section_type::where('type', $dataq->sections[$i]->product_type)->select('id', 'name', 'price', 'description', 'place_id', 'vendor_id', 'number_of_views', 'is_home', 'short_description')->with("place")->with([
+               $modified = $dataq->sections[$i]->section_type::where('type', $dataq->sections[$i]->product_type)->select('id', 'name', 'price', 'description', 'place_id', 'vendor_id', 'number_of_views', 'is_home', 'short_description', 'type')->with("place")->with([
                                             'translations:locale,model_id,attribute_data',
                                             'images:attachment_id,attachment_type,disk_name,file_name',
                                             'vendor:id,name,email,type,logo,banner,shop_title,slogan,is_instagram',
@@ -287,6 +315,19 @@ class BlogPostsApiController extends Controller
         return response()->json($data, 200);
     }
     
+    public function getSubPlaces($id)
+    {  
+        $data = City::where('primary_key', $id)->get()->toArray();
+        
+        
+        array_unshift($data, array(    
+                            "id" => (0).$id,
+                            "name" => "Ählisi",
+                            "order" => 0,
+                        ));
+        return $data;
+    }
+    
     
    public function getAccountDatas($id)
     {
@@ -300,7 +341,11 @@ class BlogPostsApiController extends Controller
         ->with('sliders')
         ->first();
         
-          $data->pathUrl = 'https://gurlushyk.com.tm' . \Config::get('cms.storage.media.path');
+         $data->pathUrl = 'https://gurlushyk.com.tm' . \Config::get('cms.storage.media.path');
+         $data->categories[0] = array(
+                                     "id" => 0,
+                                     "name"=> "Hemmesi",
+                                 ); 
         
         return response()->json($data, 200);
     }

plugins/ahmadfatoni/apigenerator/controllers/api/CategoriesAPIController.php

@@ -87,6 +87,11 @@ class CategoriesAPIController extends Controller
 
     }
     
+    public function subs($id){
+        $subs = Category::where('primary_key', $id)->get();
+        return $subs;
+    }
+
     // public function store(Request $request){
 
     // 	$arr = $request->all();

plugins/ahmadfatoni/apigenerator/controllers/api/ProductsApiController.php

@@ -77,8 +77,10 @@ class ProductsAPIController extends Controller
         $queryString = input('q');
         $locale = input('locale');
         
+        $type = input('type');
+        
         $sortPrice = input('price');
-        $place =  intval(input('place'));
+        $place =  input('place');
         
         
         $seller = input('seller_id');
@@ -94,81 +96,89 @@ class ProductsAPIController extends Controller
             ->withCount(['comments as rating_avg' => function($query) {
                 $query->select(DB::raw('avg(rating)'));
             }])
-            ->approved()
+            ->approved();
-            ->orderBy('ends_at', $sortOrder);
             
             
+            
+            
+        if($type){
+            $query = $query->where("type", $type)->orderBy('ends_at', $sortOrder);
+        }
+            
          if($sortPrice) { // fetch offers by the category of the product
      
-              $query = $this->Product::with([
+              $query = $query->orderBy('price', $sortPrice)->orderBy('ends_at', $sortOrder);
-                'translations:locale,model_id,attribute_data',
-                'images:attachment_id,attachment_type,disk_name,file_name',
-                'place',
-                'vendor:id,name,email,type,logo,banner,shop_title,slogan,is_instagram'
-                ])
-                ->withCount(['comments as rating_avg' => function($query) {
-                    $query->select(DB::raw('avg(rating)'));
-                }])
-                ->where('is_home', 1)
-                ->approved()
-                ->orderBy('price', $sortPrice)
-                ->orderBy('ends_at', $sortOrder);
         }
         
         
         if($place) { // fetch offers by the category of the product
                  
-              $query = $this->Product::with([
+            
-                'translations:locale,model_id,attribute_data',
+              if($place == (0).$place){
-                'images:attachment_id,attachment_type,disk_name,file_name',
+                  
-                'place',
+                  $allCity = City::where('primary_key', $place)->select("id")->get()->pluck('id')->toArray();
-                'vendor:id,name,email,type,logo,banner,shop_title,slogan,is_instagram'
+                  
-                ])
+                  $query = $query->where("place_id", $allCity)->orderBy('ends_at', $sortOrder);
-                ->withCount(['comments as rating_avg' => function($query) {
+                  
-                    $query->select(DB::raw('avg(rating)'));
+              }else{
-                }])
+                  
-                ->where('is_home', 1)
+                  $query = $query->where('place_id', $place)->orderBy('ends_at', $sortOrder);
-                ->approved()
+                  
-                ->where('place_id', $place)
+              }
-                ->orderBy('ends_at', $sortOrder);
+              
+              
         }
         
         
-         if($sortPrice && $place) {
+        if($seller){
             
-              $query = $this->Product::with([
+            $query = Product::with([
                 'translations:locale,model_id,attribute_data',
                 'images:attachment_id,attachment_type,disk_name,file_name',
+                'vendor:id,name,email,type,logo,banner,shop_title,slogan,is_instagram',
                 'place',
-                'vendor:id,name,email,type,logo,banner,shop_title,slogan,is_instagram'
+            ])
-                ])
+            ->withCount(['comments as rating_avg' => function($query) {
-                ->withCount(['comments as rating_avg' => function($query) {
+                $query->select(DB::raw('avg(rating)'));
-                    $query->select(DB::raw('avg(rating)'));
+            }])
-                }])
+            ->where('vendor_id', $seller)
-                ->where('is_home', 1)
+            ->approved();
-                ->approved()
+        }
-                ->where('place_id', $place)
-                ->orderBy('price', $sortPrice)
-                ->orderBy('ends_at', $sortOrder);
 
-         }
 
         if($seller && $categorySeller) {
         
             $category = Category::find($categorySeller);
+            $sellerProducts = Product::where("vendor_id", $seller);
+            
             if($category) {
-            $query = $category->products()
+                
-                ->with('categories:id,name')
+                if($categorySeller == 0){
-                ->with([
+                
-                    'translations:locale,model_id,attribute_data',
+                         $query = $sellerProducts->where('vendor_id', $seller)->with('categories:id,name')
-                    'images:attachment_id,attachment_type,disk_name,file_name',
+                            ->with([
-                ])
+                                'translations:locale,model_id,attribute_data',
-                ->withCount(['comments as rating_avg' => function($query) {
+                                'images:attachment_id,attachment_type,disk_name,file_name',
-                    $query->select(DB::raw('avg(rating)'));
+                            ])->approved()->orderBy('id', $sortOrder);
-                }])
+                    
-                ->where('vendor_id', $seller)
+                }else{
-                ->approved()
+                    
-                ->orderBy('ends_at', $sortOrder);
+                         $query = $category->products()
+                            ->with('categories:id,name')
+                            ->with([
+                                'translations:locale,model_id,attribute_data',
+                                'images:attachment_id,attachment_type,disk_name,file_name',
+                            ])
+                            ->withCount(['comments as rating_avg' => function($query) {
+                                $query->select(DB::raw('avg(rating)'));
+                            }])
+                            ->where('vendor_id', $seller)
+                            ->approved()
+                            ->orderBy('ends_at', $sortOrder);
+                    
+                    }
+                
+                
             } else {
                 $query = null;
             }
@@ -179,18 +189,40 @@ class ProductsAPIController extends Controller
         if($categoryId) { // fetch offers by the category of the product
             $category = Category::find($categoryId);
             if($category) {
+                
                 $query = $category->products()
-                ->with('categories:id,name')
+                            ->with('categories:id,name')
-                ->with([
+                            ->with([
-                    'translations:locale,model_id,attribute_data',
+                                'translations:locale,model_id,attribute_data',
-                    'images:attachment_id,attachment_type,disk_name,file_name',
+                                'images:attachment_id,attachment_type,disk_name,file_name',
-                    'place'
+                                'place'
-                ])
+                            ])
-                ->withCount(['comments as rating_avg' => function($query) {
+                            ->withCount(['comments as rating_avg' => function($query) {
-                    $query->select(DB::raw('avg(rating)'));
+                                $query->select(DB::raw('avg(rating)'));
-                }])
+                            }])
-                ->approved()
+                            ->approved();
-                ->orderBy('ends_at', $sortOrder);
+                
+                 if($place) { // fetch offers by the category of the product
+     
+                       if($place == (0).$place){
+                  
+                          $allCity = City::where('primary_key', $place)->select("id")->get()->pluck('id')->toArray();
+                          
+                          $query = $query->where("place_id", $allCity)->orderBy('ends_at', $sortOrder);
+                          
+                      }else{
+                          
+                          $query = $query->where('place_id', $place)->orderBy('ends_at', $sortOrder);
+                          
+                      }
+                 }
+                
+                 if($sortPrice){
+                     
+                     $query = $query->orderBy('price', $sortPrice)->orderBy('ends_at', $sortOrder);
+                 }
+                
+                
             } else {
                 $query = null;
             }

plugins/ahmadfatoni/apigenerator/routes.php

@@ -8,7 +8,7 @@ Route::group(['prefix' =>'api/v1','namespace' =>'AhmadFatoni\ApiGenerator\Contro
     
     
     Route::resource('categories', 'CategoriesAPIController', ['except' => ['destroy', 'create', 'edit']]);
-    // Route::get('categories/{id}/delete', ['as' => 'categories.delete', 'uses' => 'CategoriesAPIController@destroy']);
+    Route::get('category/{id}/subs', ['as' => 'category.subs', 'uses' => 'CategoriesAPIController@subs']);
 
     Route::get('products', ['as' => 'products.index', 'uses' => 'ProductsApiController@index']);
     
@@ -35,6 +35,7 @@ Route::group(['prefix' =>'api/v1','namespace' =>'AhmadFatoni\ApiGenerator\Contro
     Route::get('sliders', 'BlogPostsApiController@getSliders');
     
     Route::get('places', 'BlogPostsApiController@getPlaces');
+    Route::get('places/{id}/subs', ['as' => 'place.subs', 'uses' => 'BlogPostsApiController@getSubPlaces']);
     
     Route::get('accounts', 'BlogPostsApiController@getAccounts');
     
@@ -46,7 +47,7 @@ Route::group(['prefix' =>'api/v1','namespace' =>'AhmadFatoni\ApiGenerator\Contro
     Route::get('account/{id}/products', 'BlogPostsApiController@getAccountProducts')->where(['id' => '[0-9]+']);
     Route::get('account/{id}/datas', 'BlogPostsApiController@getAccountDatas');
     
-   
+    Route::get('get/category/datas', 'BlogPostsApiController@getCategoryDatas');
 
     Route::middleware(['\Tymon\JWTAuth\Middleware\GetUserFromToken'])->group(function () {
         Route::delete('delete/account', 'VendorApiController@deleteVendor');

plugins/rainlab/user/models/user/fields.yaml

@@ -183,6 +183,18 @@ tabs:
             imageWidth: '220'
             type: mediafinder
             tab: 'Sosial Mediýalar'
+        web1:
+            label: 'Web-de sahypa gornushleri'
+            span: auto
+            options:
+                variant1: '1-nji Versia'
+                variant2: '2-nji Versia'
+                variant3: '3-nji Versia'
+                variant4: '4-nji Versia'
+                variant5: '5-nji Versia'
+                variant6: '6-nji Versia'
+            type: balloon-selector
+            tab: 'Web Wariantlar'
 secondaryTabs:
     fields:
         avatar:

plugins/tps/birzha/Plugin.php

@@ -60,6 +60,17 @@ class Plugin extends PluginBase
         ];
     }
     
+    
+    public function registerMarkupTags()
+    {
+        return [
+            'functions' => [
+                'getProductName' => ['TPS\Birzha\Classes\Product', 'getName'],
+                'getProductImage' => ['TPS\Birzha\Classes\Product', 'getImage'],
+            ]
+        ];
+    }
+
     public function moneyColumn($value, $column, $record){
         return '<span style="color: '.($value > 0 ? 'green':'red').'">'.number_format($value,2).' tmt</span>';
     }
@@ -341,13 +352,14 @@ class Plugin extends PluginBase
             'TPS\Birzha\Components\Categories' => 'categories',
             'TPS\Birzha\Components\Sliders' => 'sliders',
             'TPS\Birzha\Components\Offers' => 'offers',
-            'TPS\Birzha\Components\FilteredProducts' => 'filteredProducts',
+            'TPS\Birzha\Components\FilteredProducts' => 'filteredproducts',
             'TPS\Birzha\Components\Singleoffer' => 'singleoffer',
             'TPS\Birzha\Components\ShopSettings' => 'shopsettings',
             'TPS\Birzha\Components\OfferForm' => 'offerform',
             'TPS\Birzha\Components\Messages' => 'messages',
             'TPS\Birzha\Components\PaymentApi' => 'paymentapi',
             'TPS\Birzha\Components\MyOffers' => 'myOffers',
+            'TPS\Birzha\Components\MyOrders' => 'myorders',
             'TPS\Birzha\Components\MyComments' => 'mycomments',
             'TPS\Birzha\Components\MyFavourites' => 'myfavourites',
             'TPS\Birzha\Components\UserOffers' => 'userOffers',
@@ -360,6 +372,7 @@ class Plugin extends PluginBase
             'TPS\Birzha\Components\Birzhadocs' => 'birzhadocs',
             'TPS\Birzha\Components\CategoryProfile' => 'categoryprofile',
             'TPS\Birzha\Components\Checkout' => 'checkout',
+            'TPS\Birzha\Components\OrderDetail' => 'orderdetail',
         ];
     }
 

plugins/tps/birzha/classes/Product.php

@@ -0,0 +1,20 @@
+<?php
+namespace TPS\Birzha\Classes;
+
+use TPS\Birzha\Models\Product as ProductItem;
+
+
+class Product
+{
+    public static function getName($id)
+    {
+        $product = ProductItem::find($id);
+        return $product->name;
+    }
+
+    public static function getImage($id)
+    {
+        $product = ProductItem::find($id);
+        return $product->images[0]->path;
+    }
+}

plugins/tps/birzha/components/FilteredProducts.php

@@ -58,6 +58,7 @@ class FilteredProducts extends ComponentBase
     {
         $allParams = \Input::all();
 
+
         $params = '';
 
         foreach ($allParams as $key => $item) {
@@ -103,6 +104,7 @@ class FilteredProducts extends ComponentBase
             $this->sortParam = $sortOrderParam;
         }
         
+
         $perPage = $this->property('perPage');
         $products = Product::query();
 
@@ -136,8 +138,7 @@ class FilteredProducts extends ComponentBase
             $products = $products->orderBy( $sort[0], $sort[1]);
         }
 
-        $products = $products->where('status', 'approved')->withCount("images")->orderBy('updated_at', $sortOrder);
+        $products = $products->where('status', 'approved')->withCount("images");
-
         return $products ? $products->paginate($perPage) : null;
     }
 

plugins/tps/birzha/components/MyOrders.php

@@ -0,0 +1,51 @@
+<?php namespace TPS\Birzha\Components;
+
+use Cms\Classes\ComponentBase;
+use TPS\Birzha\Models\Product;
+use Input;
+use Flash;
+
+class MyOrders extends ComponentBase
+{
+    /**
+     * @var Collection A collection of user's posts
+     */
+    public $orders;
+    
+
+    
+    public function componentDetails()
+    {
+        return [
+            'name'        => 'MyOrders List',
+            'description' => 'List of my orders'
+        ];
+    }
+
+    public function defineProperties()
+    {
+        return [
+            'perPage' => [
+                'title' => 'Number of offers',
+                'description' => 'How many offers do you want to display',
+                'default' => 12,
+                'validationPattern' => '^[0-9]+$',
+                'validationMessage' => 'Only numbers allowed'
+            ],
+        ];
+    }
+
+
+    public function onRun() {
+        $this->orders = $this->loadOrders();
+    }
+
+    protected function loadOrders() {
+        $perPage = $this->property('perPage');
+        return \Auth::user()->orders()
+            ->orderBy('updated_at', 'desc')
+            ->paginate($perPage);
+    }
+
+    
+}

plugins/tps/birzha/components/OfferForm.php

@@ -91,19 +91,26 @@ class OfferForm extends ComponentBase
         }
 
         $category = null;
-        if($data["subcategory_id"] != 'null'){
+        if(isset($data["subcategory_id"]) && $data["subcategory_id"] != 'null'){
             $category = Category::find($data['subcategory_id']);
         }else{
             $category = Category::find($data['category_id']);
         }
         
+        $place = null;
+        if(isset($data["city_id"]) && $data["city_id"] != 'null'){
+            $place = $data['city_id'];
+        }else{
+            $place = $data['state_id'];
+        }
+
         $product = new Product;
         $product->name = $data['name'];
         $product->description = $data['description'];
         $product->short_description = $data['short_description'];
         $product->slug = \Str::slug($data['name'],'-');
         $product->status = 'new';
-        $product->place_id = $data['city_id'] == 'null' ? $data['state_id'] : $data['city_id'];
+        $product->place_id = $place;
         $product->price = $data['price'];
         $product->phone = $data['phone'];
         $product->is_file_product = $data['is_file'];

plugins/tps/birzha/components/Offers.php

@@ -119,7 +119,7 @@ class Offers extends ComponentBase
         $productSlug = $this->property('productSlug');
         $offerId = $this->property('offerId');
 
-        $query = Product::where('status', 'approved')->withCount("images")
+        $query = Product::where('status', 'approved')->with("vendor")->withCount("images")
             ->orderBy('ends_at', $sortOrder);
 
         if($cSlug != '') {

plugins/tps/birzha/components/OrderDetail.php

@@ -0,0 +1,46 @@
+<?php namespace TPS\Birzha\Components;
+
+use Cms\Classes\ComponentBase;
+use TPS\Birzha\Models\Product;
+use TPS\Birzha\Models\Comment;
+use TPS\Birzha\Models\OrderItems;
+use RainLab\User\Facades\Auth;
+use Flash;
+
+class OrderDetail extends ComponentBase
+{
+    public $order;
+    
+    public function componentDetails()
+    {
+        return [
+            'name'        => 'Single order',
+            'description' => 'Selected order'
+        ];
+    }
+    
+        public function defineProperties()
+    {
+        return [
+            'id' => [
+                'title' => 'Order id',
+                'description' => 'Order id',
+                'type' => 'string',
+                'default' => '{{ :id }}'
+            ]
+        ];
+    }
+
+
+    public function onRun() {
+        $this->order = $this->loadOrder();
+    }
+
+
+
+
+    protected function loadOrder() {
+        $order = OrderItems::where('order_id', $this->property('id'))->first();
+        return $order;
+    }
+}

plugins/tps/birzha/components/SearchOffers.php

@@ -67,7 +67,7 @@ class SearchOffers extends ComponentBase
             $products = $products->where('name', 'like', '%'.$title.'%')->withCount("images");
         }
 
-        $products = $products->paginate($perPage);
+        $products = $products->with("vendor")->paginate($perPage);
         return $products;
     }
 

plugins/tps/birzha/components/UserOffers.php

@@ -14,8 +14,10 @@ class UserOffers extends ComponentBase
      */
     public $userProducts;
     public $userCategories;
-    public $user;
+    public $userProfile;
     public $params;
+    public $sliders;
+    public $currentCat;
         
     public function componentDetails()
     {
@@ -65,8 +67,10 @@ class UserOffers extends ComponentBase
 
         $this->params = $params;
         $this->userCategories = $this->loadCategories();
-        $this->user = $this->loadUser();
+        $this->userProfile = $this->loadUser();
         $this->userProducts = $this->loadProducts();
+        $this->sliders = $this->loadSliders();
+        $this->currentCat = $this->loadCurrentCategory();
     }
 
     protected function loadProducts() {
@@ -75,10 +79,14 @@ class UserOffers extends ComponentBase
         $sort = \Input::get('sort');
         $vendor_id = $this->property('id');
         $categorySlug = $this->property('slug');
+        $category = null;
 
-        $category = Category::where('slug', $categorySlug)->first();
+        if($categorySlug){
+            $category = Category::where('slug', $categorySlug)->first();
+        }
         $products = Product::query();
 
+
         if($category){
             if (isset($sort) && $sort != '') {
                 $sort = self::getSort($sort);
@@ -90,9 +98,14 @@ class UserOffers extends ComponentBase
             if (isset($sort) && $sort != '') {
                 $sort = self::getSort($sort);
                 $products = $products->where("vendor_id", $vendor_id)->withCount("images")->orderBy( $sort[0], $sort[1]);
+            }else{
+                
+                $products = $products->where("vendor_id", $vendor_id)->withCount("images")->orderBy( "id", "DESC");
+                
             } 
         }
         $products = $products->paginate($perPage);
+        
         return $products;
     }
 
@@ -113,15 +126,34 @@ class UserOffers extends ComponentBase
 
     protected function loadCategories(){
         $user = User::find($this->property('id'));
-        $categories = $user->categories()->get();
+        if($user){
-        return $categories;
+            $categories = $user->categories()->get();
+            return $categories;
+        }
+        
+        return null;
     }
     
-    protected function loadUser(){
+    protected function loadCurrentCategory(){
-        $user = User::find($this->property('id'));
+        $currentCat = Category::where("slug", $this->property('slug'))->first();
+        if($currentCat){
+        return $currentCat;
+        }
+        
+        return null;
+    }
+    
+    public function loadUser(){
+        $user = User::with("sliders")->find($this->property('id'));
         return $user;
     }
     
+    protected function loadSliders(){
+        $user = User::find($this->property('id'));
+        return $user->sliders()->get();
+    }
+
+
 
 
     

plugins/tps/birzha/components/categories/with_images.htm

@@ -21,7 +21,7 @@
         
     >
         <div class="cat_photo">
-            <img src="{{ category.icon|media }}" alt="">
+            <img src="{{ category.icon|media }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ category.name }}">
         </div>
         <div class="cat_text">
             {{ category.name }}

plugins/tps/birzha/components/categoryprofile/default.htm

@@ -20,13 +20,6 @@
 <!-- Shop Catagory Area -->
 <div class="shop_by_catagory_area section_padding_0">
     <div class="container">
-        <div class="row">
-            <div class="col-12">
-                <div class="section-heading mb-50">
-                    <!-- <h5>Kategoriýalar</h5> -->
-                </div>
-            </div>
-        </div>
    
         <div class="row">
             <div class="col-12">
@@ -36,7 +29,7 @@
                     {% for category in category.subs %}
                         <div class="single_catagory_slide">
                             <a href="{{ 'category-products'|page({categorySlug: category.slug}) }}">
-                                <img src="{{ category.icon|media|resize(127, 127, { mode: 'crop' }) }}" alt="{{ category.name }}">
+                                <img src="{{ category.icon|media|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ category.name }}">
                             </a>
                             <p>{{ category.name }}</p>
                         </div>
@@ -52,17 +45,166 @@
 <!-- Brands Area -->
 <section class="catagories_area home-3 section_padding_70_70">
     <div class="container">
-        <div class="row justify-content-center">
+        <div class="row justify-content-start">
+
             {% for user in users %}
-                    <div class="col-12 col-md-6 col-lg-4">
+
-                    <a href="{{ 'user-profile'|page({id: user.id}) }}">
+                    <div class="col-4 col-md-4 col-lg-4 mt-4">
-                        <div class="single_catagory mb-30">
+                        <a href="{{ 'user-profile'|page({id: user.id}) }}">
-                            <img src="{{ user.banner|media|resize(600, 450, { mode: 'crop' }) }}" alt="{{ user.name }}">
+                            <div class="userBannerBg">
-                        </div>
+                                <div class="single_catagory">
-                    </a>
+                                    <img src="{{ user.banner|media|resize( 950, 535, {mode: 'crop'} )}}" alt="Gurluşyk, Gurluşyk Platforma, Bezeg, Gipsler merkezi, {{ user.shop_title }}, {{ user.name }}">
+                                </div>
+                                <div class="userBannerTitle">
+                                    {{ user.shop_title }}
+                                </div>
+                            </div>
+                        </a>
                     </div>
+
             {% endfor %}
+
         </div>
     </div>
 </section>
 <!-- Brands Area -->
+
+<div class="container">
+    <div class="shop_grid_product_area">
+        <div class="row justify-content-center">
+    {% for category in category.subs %}
+        {% for product in category.products %}
+             <!-- Single Product -->
+                <div class="col-9 col-sm-12 col-md-6 col-lg-4">
+                    <div class="single-product-area mb-30">
+                        <a href="{{ 'product'|page({id: product.id}) }}">
+                            <div class="product_image">
+                                <!-- Product Image -->
+                                <img class="normal_img" src="{{ product.images[0].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
+                                {% if product.images_count > 1 %}
+                                    <img class="hover_img" src="{{ product.images[1].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
+                                {% endif %}
+                                <!-- Wishlist -->
+                                <div class="product_wishlist">
+                                    {% if user %}
+                                        <a href="{{ 'wishlist'|page }}"><i class="icofont-heart"></i></a>
+                                    {% else %}
+                                        <a href="{{ 'login'|page }}"><i class="icofont-heart"></i></a>
+                                    {% endif %}
+                                </div>
+                            </div>
+                        </a>
+    
+                        <!-- Product Description -->
+                        <div class="product_description">
+                            <!-- Add to cart -->
+                            {% if user %}
+                                <div class="product_add_to_cart addToCard" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">
+                                    <input type="hidden" min="1" id="quantity{{ product.id }}" value="1">
+                                    <a href="#"><i class="icofont-shopping-cart"></i> Sebede goş</a>
+                                </div>
+                            {% else %}
+                                <div class="product_add_to_cart">
+                                    <a href="{{ 'login'|page }}"><i class="icofont-shopping-cart"></i> Sebede goş</a>
+                                </div>
+                            {% endif %}
+                            <!-- Quick View -->
+                            <div class="product_quick_view">
+                                <a href="#" data-toggle="modal" data-target="#quickview{{product.id}}"><i class="icofont-eye-alt"></i> Doly maglumat</a>
+                            </div>
+                             <p class="brand_name">{{product.vendor.shop_title}}</p>
+                            <a href="{{ 'product'|page({id: product.id}) }}">{{ product.name }}</a>
+                            <h6 class="product-price">{{ product.price }} TMT</h6>
+                        </div>
+                    </div>
+                </div>
+        {% endfor %}
+    {% endfor %}
+        </div>
+    </div>
+</div>
+
+
+<!-- product modals -->
+{% for category in category.subs %}
+    {% for product in category.products %}
+        <!-- Quick View Modal Area -->
+        <div class="modal fade" id="quickview{{product.id}}" tabindex="-1" role="dialog" aria-labelledby="quickview" aria-hidden="true">
+            <div class="modal-dialog modal-lg modal-dialog-centered" role="document">
+                <div class="modal-content">
+                    <button type="button" class="close btn" data-dismiss="modal" aria-label="Close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                    <div class="modal-body">
+                        <div class="quickview_body">
+                            <div class="container">
+                                <div class="row">
+                                    <div class="col-12 col-lg-5">
+                                        <div class="quickview_pro_img">
+                                            <img class="first_img" src="{{ product.images[0].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
+                                            {% if product.images_count > 1 %}
+                                                <img class="hover_img" src="{{ product.images[1].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
+                                            {% endif %}
+                                        </div>
+                                    </div>
+                                    <div class="col-12 col-lg-7">
+                                        <div class="quickview_pro_des">
+                                            <h4 class="title">{{ product.name }}</h4>
+                                            <div class="top_seller_product_rating mb-15">
+                                                <i class="fa fa-star" aria-hidden="true"></i>
+                                                <i class="fa fa-star" aria-hidden="true"></i>
+                                                <i class="fa fa-star" aria-hidden="true"></i>
+                                                <i class="fa fa-star" aria-hidden="true"></i>
+                                                <i class="fa fa-star" aria-hidden="true"></i>
+                                            </div>
+                                            <h5 class="price">{{ product.price }} TMT</h5>
+                                            <p>{{ html_limit(product.description, 100) }}</p>
+                                            <a href="{{ 'product'|page({id: product.id}) }}">Giňişleýin maglumat</a>
+                                        </div>
+                                        <!-- Add to Cart Form -->
+                                        <form class="cart" method="post">
+                                            <div class="quantity">
+                                                <input type="number" class="qty-text form-control" id="quantity{{ product.id }}" step="1" min="1" value="1">
+                                            </div>
+                                            {% if user %}
+                                             <div class="product_add_to_cart addToCard" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">  
+                                                    <a href="#" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">Sebede goş</a>
+                                             </div>
+                                            {% else %}
+                                                <div class="product_add_to_cart" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">  
+                                                        <a href="{{ 'login'|page }}" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">Sebede goş</a>
+                                                 </div>
+                                            {% endif %}
+                                            <!-- Wishlist -->
+                                            <div class="modal_pro_wishlist">
+                                                {% if user %}
+                                                    <a href="{{ 'wishlist'|page }}"><i class="icofont-heart"></i></a>
+                                                {% else %}
+                                                    <a href="{{ 'login'|page }}"><i class="icofont-heart"></i></a>
+                                                {% endif %}
+                                            </div>
+        
+                                        </form>
+                                        <!-- Share -->
+                                        <div class="share_wf mt-30">
+                                            <p>Paýlaşmak</p>
+                                            <div class="_icon">
+                                                <a href="#"><i class="fa fa-facebook" aria-hidden="true"></i></a>
+                                                <a href="#"><i class="fa fa-twitter" aria-hidden="true"></i></a>
+                                                <a href="#"><i class="fa fa-pinterest" aria-hidden="true"></i></a>
+                                                <a href="#"><i class="fa fa-linkedin" aria-hidden="true"></i></a>
+                                                <a href="#"><i class="fa fa-instagram" aria-hidden="true"></i></a>
+                                                <a href="#"><i class="fa fa-envelope-o" aria-hidden="true"></i></a>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- Quick View Modal Area -->
+    {% endfor %}
+{% endfor %}

plugins/tps/birzha/components/checkout/default.htm

@@ -50,7 +50,8 @@
                     <div class="cart-apply-coupon mb-30">
                         <div class="coupon-form">
                             <input type="text" class="form-control" name="address" placeholder="Adresiňiz" required>
-                            <textarea class="form-control" id="order-notes" cols="30" rows="10" placeholder="Bellik" name="note" required></textarea>
+                            <input type="text" class="form-control" name="phone_custom" placeholder="Telefon Belgiňiz">
+                            <textarea class="form-control" id="order-notes" cols="30" rows="10" placeholder="Bellik" name="note" style="height: 90px;" required></textarea>
                         </div>
                     </div>
                 </div>
@@ -88,6 +89,7 @@
         localStorage.removeItem("cartForForm");
         localStorage.removeItem("products");
         localStorage.removeItem("productsForForm");
+        location.reload()
     }
     function resetFormFailed() {
         document.getElementById('checkoutForm').reset(); // Reset the form
@@ -119,7 +121,7 @@
             cartBody.append(`
                 <tr>
                     <td>
-                        <img src="`+item.image+`" alt="`+item.name+`">
+                        <img src="`+item.image+`" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi `+item.name+`">
                     </td>
                     <td>`+item.name+`</td>
                     <td>`+item.price+`</td>

plugins/tps/birzha/components/contactform/default.htm

@@ -22,7 +22,12 @@
                 <div class="login_form mb-50">
                     <h5 class="mb-3">Habarlaşmak</h5>
                     <div class="shortcodes_content">
-                        <form action="#" data-request="onSend" data-request-validate data-request-flash class="contact_form">
+                        <form action="#" data-request="onSend" 
+                                         data-request-validate 
+                                         data-request-flash
+                                         data-request-success="resetForm()"
+                                         data-request-error="resetForm()" 
+                                         class="contact_form">
                             
                             <div class="row">
                                 <div class="col-md-6 mb-3">
@@ -56,3 +61,12 @@
         </div>
     </div>
 </div>
+
+{% put scripts %}
+<script>
+    function resetForm() {
+        document.getElementById('offerForm').reset(); // Reset the form
+        document.getElementById('offerUpdateForm').reset();
+    }
+</script>
+{% endput %}

plugins/tps/birzha/components/filteredproducts/default.htm

@@ -65,16 +65,6 @@
                                            placeholder="1350" value="{{input('max_price') ? input('max_price') : null}}">
                                 </div>
                             </div>
-<!--                            <div class="widget-desc">-->
-<!--                                <div class="slider-range">-->
-<!--                                    <div data-min="0" data-max="1350" data-unit=" TMT" class="slider-range-price ui-slider ui-slider-horizontal ui-widget ui-widget-content ui-corner-all" data-value-min="0" data-value-max="1350" data-label-result="Baha:">-->
-<!--                                        <div class="ui-slider-range ui-widget-header ui-corner-all"></div>-->
-<!--                                        <span class="ui-slider-handle ui-state-default ui-corner-all" tabindex="0"></span>-->
-<!--                                        <span class="ui-slider-handle ui-state-default ui-corner-all" tabindex="0"></span>-->
-<!--                                    </div>-->
-<!--                                    <div class="range-price">Baha: 0 - 1350</div>-->
-<!--                                </div>-->
-<!--                            </div>-->
                         </div>
                        <button type="submit" class="btn btn-primary" style="width: 100%"> Filterle </button>
                     </form>
@@ -114,9 +104,9 @@
                                             <div class="row">
                                                 <div class="col-12 col-lg-5">
                                                     <div class="quickview_pro_img">
-                                                        <img class="first_img" src="{{ product.images[0].path }}" alt="">
+                                                        <img class="first_img" src="{{ product.images[0].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
                                                         {% if product.images_count > 1 %}
-                                                            <img class="hover_img" src="{{ product.images[1].path }}" alt="">
+                                                            <img class="hover_img" src="{{ product.images[1].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
                                                         {% endif %}
                                                     </div>
                                                 </div>
@@ -137,9 +127,17 @@
                                                     <!-- Add to Cart Form -->
                                                     <form class="cart" method="post">
                                                         <div class="quantity">
-                                                            <input type="number" class="qty-text" id="qty" step="1" min="1" max="12" name="quantity" value="1">
+                                                            <input type="number" class="qty-text form-control" id="quantity{{ product.id }}" step="1" min="1" value="1">
                                                         </div>
-                                                        <button type="submit" name="addtocart" value="5" class="cart-submit">Sebede goş</button>
+                                                        {% if user %}
+                                                         <div class="product_add_to_cart addToCard" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">  
+                                                                <a href="#" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">Sebede goş</a>
+                                                         </div>
+                                                        {% else %}
+                                                            <div class="product_add_to_cart" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">  
+                                                                    <a href="{{ 'login'|page }}" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">Sebede goş</a>
+                                                             </div>
+                                                        {% endif %}
                                                         <!-- Wishlist -->
                                                         <div class="modal_pro_wishlist">
                                                             {% if user %}
@@ -178,21 +176,30 @@
                         <!-- Single Product -->
                         <div class="col-9 col-sm-12 col-md-6 col-lg-4">
                             <div class="single-product-area mb-30">
+                            <a href="{{ 'product'|page({id: product.id}) }}">
                                 <div class="product_image">
                                     <!-- Product Image -->
-                                    <img class="normal_img" src="{{ product.images[0].path }}" alt="{{ product.name }}">
+                                    <img class="normal_img" src="{{ product.images[0].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
-                                    <img class="hover_img" src="{{ product.images[1].path }}" alt="{{ product.name }}">
+                                     {% if product.images_count > 1 %}
+                                         <img class="hover_img" src="{{ product.images[1].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">   
+                                     {% endif %}
+                                    
                                     <!-- Wishlist -->
                                     <div class="product_wishlist">
-                                        <a href="wishlist.html"><i class="icofont-heart"></i></a>
+                                       {% if user %}
+                                            <a href="{{ 'wishlist'|page }}"><i class="icofont-heart"></i></a>
+                                       {% else %}
+                                           <a href="{{ 'login'|page }}"><i class="icofont-heart"></i></a>
+                                       {% endif %}
                                     </div>
                                 </div>
+                            </a>
 
                                 <!-- Product Description -->
                                 <div class="product_description">
                                     <!-- Add to cart -->
                                     {% if user %}
-                                        <div class="product_add_to_cart" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">
+                                        <div class="product_add_to_cart addToCard" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">
                                             <input type="hidden" min="1" id="quantity{{ product.id }}" value="1">
                                             <a href="#"><i class="icofont-shopping-cart"></i> Sebede goş</a>
                                         </div>
@@ -206,7 +213,7 @@
                                         <a href="#" data-toggle="modal" data-target="#quickview{{product.id}}"><i class="icofont-eye-alt"></i> Doly maglumat</a>
                                     </div>
                                     <p class="brand_name"></p>
-                                    <a href="#">{{ product.name }}</a>
+                                    <a href="{{ 'product'|page({id: product.id}) }}">{{ product.name }}</a>
                                     <h6 class="product-price">{{ product.price }} TMT</h6>
                                 </div>
                             </div>
@@ -225,11 +232,16 @@
                                 {% endif %}
                     
                                 {% for page in range(1, products.lastPage) %}
-                                    <li class="page-item"><a class="page-link" href="{{ products.url(page) }}{{params}}">{{ page }}</a></li>
+                                    {% if page == products.currentPage %}
+                                        <li class="page-item active"><a class="page-link" href="{{ products.url(page) }}{{params}}">{{ page }}</a></li>
+                                    {% elseif page > products.currentPage - 3 and page < products.currentPage + 3 %}
+                                        <li class="page-item"><a class="page-link" href="{{ products.url(page) }}{{params}}">{{ page }}</a></li>
+                                    {% elseif page == products.currentPage + 3 or page == products.currentPage - 3 %}
+                                        <li>...</li>
+                                    {% endif %}
                                 {% endfor %}
                     
                                 {% if products.lastPage > products.currentPage %}
-
                                     <li class="page-item"><a class="page-link" href="{{ products.nextPageUrl }}{{params}}">Indiki</a></li>
                                 {% endif %}
                             </ul>

plugins/tps/birzha/components/myfavourites/default.htm

@@ -37,7 +37,7 @@
                                     <tr>
                                         <td>
                                             <a href="{{ 'product'|page({id: favourite.product.id}) }}">
-                                                <img src="{{ favourite.product.images[0].thumb(60,60, { mode: 'crop' }) }}" alt="Product">
+                                                <img src="{{ favourite.product.images[0].thumb(60,60, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ favourite.product.name }}">
                                             </a>
                                         </td>
                                         <td>

plugins/tps/birzha/components/myoffers/default.htm

@@ -36,7 +36,7 @@
                                 {% for product in products %}
                                     <tr>
                                         <td>
-                                            <img src="{{ product.images[0].thumb(60,60, { mode: 'crop' }) }}" alt="Product">
+                                            <img src="{{ product.images[0].thumb(60,60, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
                                         </td>
                                         <td>
                                             <a href="{{ 'product'|page({id: product.id}) }}">{{ product.name }}</a>

plugins/tps/birzha/components/myorders/default.htm

@@ -0,0 +1,53 @@
+{% set orders = __SELF__.orders %}
+<!-- Breadcumb Area -->
+<div class="breadcumb_area">
+    <div class="container h-100">
+        <div class="row h-100 align-items-center">
+            <div class="col-12">
+                <h5>Harytlarym</h5>
+                <ol class="breadcrumb">
+                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">Esasy sahypa</a></li>
+                    <li class="breadcrumb-item active">Zakazlarym</li>
+                </ol>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- Breadcumb Area -->
+
+<!-- Wishlist Table Area -->
+<div class="wishlist-table section_padding_100 clearfix">
+    <div class="container">
+        <div class="row">
+            <div class="col-12">
+                <div class="cart-table wishlist-table">
+                    <div class="table-responsive">
+                        <table class="table table-bordered mb-30">
+                            <thead>
+                                <tr>
+                                    <th scope="col">Tertip belgisi</th>
+                                    <th scope="col">Wagty</th>
+                                    <th scope="col">Status</th>
+                                    <th scope="col"></th>
+                                </tr>
+                            </thead>
+                            <tbody>
+
+                                {% for order in orders %}
+                                    <tr>
+                                        <td># {{ order.id }}</td>
+                                        <td>{{ order.created_at.format('d.m.Y') }}</td>
+                                        <td><span class="badge {{ sale.status == 'new' ? 'badge-secondary' : 'badge-success' }}">{{ order.status == 'new' ? 'Täze sargyt' : 'Kabul edildi' }}</span></td>
+                                        <td align="center" width="25%">
+                                            <a href="{{ 'order-detail'|page({id: order.id}) }}" class="btn btn-primary btn-sm">Sargydy görmek</a>
+                                        </td>
+                                    </tr>
+                                {% endfor %}
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

plugins/tps/birzha/components/offerform/default.htm

@@ -1,4 +1,3 @@
-
 {% set categories = __SELF__.categories %}
 {% set subcategories = __SELF__.subcategories %}
 {% set states = __SELF__.states %}
@@ -47,7 +46,7 @@
                                 <div class="col-md-6 mb-3">
                                     <label for="category">Kategoriýa goshmak</label>
                                     <select class="custom-select d-block w-100 form-control" id="category" data-belongsto="product" name="category_id" required>
-                                        <option value="">Kategoriýa saýla</option>
+                                        <option value="" disabled>Kategoriýa saýla</option>
                                         {% for category in categories %}
                                             <option value="{{ category.id }}" data-file="{{ category.is_file_category }}">{{ category.name }}</option>
                                         {% endfor %}
@@ -55,17 +54,15 @@
                                 </div>
                                 <div class="col-md-6 mb-3">
                                     <label for="subcategory">Ikinji kategoriýa</label>
-                                    <select class="custom-select d-block w-100 form-control" id="subcategory" name="subcategory_id" required>
+                                    <select class="custom-select d-block w-100 form-control" id="subcategoryAdd" name="subcategory_id" disabled>
                                         <option value=null>Subkategoriýa saýla</option>
-                                        {% for sub in subcategories %}
+
-                                            <option value="{{ sub.id }}" data-file="{{ sub.is_file_category }}">{{ sub.name }}</option>
-                                        {% endfor %}
                                     </select>
                                 </div>
                                 <div class="col-md-6 mb-3">
                                     <label for="city">Welaýat</label>
                                     <select class="custom-select d-block w-100 form-control" id="city" name="state_id">
-                                        <option value=null>Welaýat saýla</option>
+                                        <option value=null disabled>Welaýat saýla</option>
                                         {% for state in states %}
                                             <option value="{{ state.id }}">{{ state.name }}</option>
                                         {% endfor %}
@@ -73,11 +70,8 @@
                                 </div>
                                 <div class="col-md-6 mb-3">
                                     <label for="subCity">Şäher</label>
-                                    <select class="custom-select d-block w-100 form-control" id="subCity" name="city_id">
+                                    <select class="custom-select d-block w-100 form-control" id="subCityAdd" name="city_id" disabled>
                                         <option value=null>Şäher saýla</option>
-                                        {% for city in cities %}
-                                            <option value="{{ city.id }}">{{ city.name }}</option>
-                                        {% endfor %}
                                     </select>
                                 </div>
                                 
@@ -91,11 +85,11 @@
                                 </div>
                                 <div class="col-md-12 mb-3">
                                     <label for="order-notes">Gysga beýany</label>
-                                    <textarea class="form-control" id="shortDescription" cols="30" name="short_description" rows="10" placeholder="Gysga beýany" required></textarea>
+                                    <textarea class="form-control" id="shortDescription" cols="30" name="short_description" rows="10" placeholder="Gysga beýany" style="height: 160px;" required></textarea>
                                 </div>
                                 <div class="col-md-12 mb-3">
                                     <label for="order-notes">Giňişleýin beýany</label>
-                                    <textarea class="form-control" id="description" cols="30" rows="20" name="description" placeholder="Giňişleýin beýany" required></textarea>
+                                    <textarea class="form-control" id="description" cols="30" rows="20" name="description" style="height: 160px;" placeholder="Giňişleýin beýany" required></textarea>
                                 </div>
                                 <div class="col-md-6 mb-3">
                                     <label for="phone">Telefon belgisi</label>
@@ -140,7 +134,7 @@
                                     </div>
                                     <div class="col-md-6 mb-3">
                                         <label for="subcategory">Ikinji kategoriýa</label>
-                                        <select class="custom-select d-block w-100 form-control" id="subcategory" name="subcategory_id" required>
+                                        <select class="custom-select d-block w-100 form-control" id="subcategoryEdit" name="subcategory_id" required>
                                             <option value=null>Subkategoriýa saýla</option>
                                             {% for sub in subcategories %}
                                                 <option value="{{ sub.id }}" {{ productForEditing.categories.contains(sub.id) ? 'selected' : '' }} data-file="{{ sub.is_file_category }}">{{ sub.name }}</option>
@@ -149,7 +143,7 @@
                                     </div>
                                     <div class="col-md-6 mb-3">
                                         <label for="city">Welaýat</label>
-                                        <select class="custom-select d-block w-100 form-control" id="city" name="state_id">
+                                        <select class="custom-select d-block w-100 form-control" id="cityEdit" name="state_id">
                                             <option value=null>Welaýat saýla</option>
                                             {% for state in states %}
                                                 <option value="{{ state.id }}" {{ productForEditing.place_id == state.id ? 'selected' : '' }}>{{ state.name }}</option>
@@ -158,7 +152,7 @@
                                     </div>
                                     <div class="col-md-6 mb-3">
                                         <label for="subCity">Şäher</label>
-                                        <select class="custom-select d-block w-100 form-control" id="subCity" name="city_id">
+                                        <select class="custom-select d-block w-100 form-control" id="subCityEdit" name="city_id">
                                             <option value=null>Şäher saýla</option>
                                             {% for city in cities %}
                                                 <option value="{{ city.id }}" {{ productForEditing.place_id == city.id ? 'selected' : '' }}>{{ city.name }}</option>
@@ -212,7 +206,10 @@
 <script>
     function resetForm() {
         document.getElementById('offerForm').reset(); // Reset the form
-        document.getElementById('offerUpdateForm').reset();
+        var updateForm = document.getElementById('offerUpdateForm');
+        if (updateForm){
+            document.getElementById('offerUpdateForm').reset()
+        }
     }
 </script>
 <script>
@@ -229,6 +226,26 @@ $(document).ready(function() {
         $("#new_file").removeAttr("required");
         $("#newFileDiv").addClass("d-none");
       }
+      
+      //get subcategories
+      var url = '{{ route("category.subs", ":id") }}';
+      url = url.replace(':id', selectedValue);
+      $.get(url, function (data){
+            if(data.length > 0)
+            {
+                $('#subcategoryAdd').attr("disabled", false);
+                $('#subcategoryAdd').empty();
+                for (let i = 0; i < data.length; i++) {
+                    $('#subcategoryAdd').append('<option value ="'+data[i]['id']+'" data-file="'+data[i]['is_file_category']+'">'+data[i]['name']+'</option>');
+                }
+            }
+            else
+            {
+                $('#subcategoryAdd').empty();
+                $('#subcategoryAdd').append('<option value ="">Ikinji kategoriýa ýok</option>');
+                $('#subcategoryAdd').attr("disabled", true);
+            }
+        });
     });
 
     $("#categoryEdit").on("change", function() {
@@ -243,7 +260,79 @@ $(document).ready(function() {
         $("#new_file").val(null);
         $("#newFileDiv").addClass("d-none");
       }
+      
+        //get subcategories
+        var url = '{{ route("category.subs", ":id") }}';
+        url = url.replace(':id', selectedValue);
+        $.get(url, function (data){
+            if(data.length > 0)
+            {
+                $('#subcategoryEdit').attr("disabled", false);
+                $('#subcategoryEdit').empty();
+                for (let i = 0; i < data.length; i++) {
+                    $('#subcategoryEdit').append('<option value ="'+data[i]['id']+'" data-file="'+data[i]['is_file_category']+'">'+data[i]['name']+'</option>');
+                }
+            }
+            else
+            {
+                $('#subcategoryEdit').empty();
+                $('#subcategoryEdit').append('<option value ="">Ikinji kategoriýa ýok</option>');
+                $('#subcategoryEdit').attr("disabled", true);
+            }
+        });
+      
     });
+    
+    
+     //places
+    $("#city").on("change", function() {
+      var selectedValue = $(this).val();
+      var url = '{{ route("place.subs", ":id") }}';
+      url = url.replace(':id', selectedValue);
+      $.get(url, function (data){
+            if(data.length > 0)
+            {
+                $('#subCityAdd').attr("disabled", false);
+                $('#subCityAdd').empty();
+                for (let i = 0; i < data.length; i++) {
+                    $('#subCityAdd').append('<option value ="'+data[i]['id']+'">'+data[i]['name']+'</option>');
+                }
+            }
+            else
+            {
+                $('#subCityAdd').empty();
+                $('#subCityAdd').append('<option value ="">Degişli şäher ýok</option>');
+                $('#subCityAdd').attr("disabled", true);
+            }
+        });
+    });
+
+
+    $("#cityEdit").on("change", function() {
+        var selectedValue = $(this).val();
+        var url = '{{ route("place.subs", ":id") }}';
+        url = url.replace(':id', selectedValue);
+        $.get(url, function (data){
+            if(data.length > 0)
+            {
+                $('#subCityEdit').attr("disabled", false);
+                $('#subCityEdit').empty();
+                for (let i = 0; i < data.length; i++) {
+                    $('#subCityEdit').append('<option value ="'+data[i]['id']+'" data-file="'+data[i]['is_file_category']+'">'+data[i]['name']+'</option>');
+                }
+            }
+            else
+            {
+                $('#subCityEdit').empty();
+                $('#subCityEdit').append('<option value ="">Degişli şäher ýok</option>');
+                $('#subCityEdit').attr("disabled", true);
+            }
+        });
+    });
+    
+    
+    
+    
   });
 </script>
 {% endput %}

plugins/tps/birzha/components/offers/default.htm

@@ -18,9 +18,9 @@
                         <div class="row">
                             <div class="col-12 col-lg-5">
                                 <div class="quickview_pro_img">
-                                    <img class="first_img" src="{{ product.images[0].path }}" alt="">
+                                    <img class="first_img" src="{{ product.images[0].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
                                     {% if product.images_count > 1 %}
-                                        <img class="hover_img" src="{{ product.images[1].path }}" alt="">
+                                        <img class="hover_img" src="{{ product.images[1].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
                                     {% endif %}
                                 </div>
                             </div>
@@ -41,13 +41,21 @@
                                 <!-- Add to Cart Form -->
                                 <form class="cart" method="post">
                                     <div class="quantity">
-                                        <input type="number" class="qty-text" id="qty" step="1" min="1" max="12" name="quantity" value="1">
+                                        <input type="number" class="qty-text form-control" id="quantity{{ product.id }}" step="1" min="1" value="1">
                                     </div>
-                                    <button type="submit" name="addtocart" value="5" class="cart-submit">Sebede goş</button>
+                                    {% if user %}
+                                     <div class="product_add_to_cart addToCard" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">  
+                                            <a href="#" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">Sebede goş</a>
+                                     </div>
+                                    {% else %}
+                                        <div class="product_add_to_cart" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">  
+                                                <a href="{{ 'login'|page }}" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">Sebede goş</a>
+                                         </div>
+                                    {% endif %}
                                     <!-- Wishlist -->
                                     <div class="modal_pro_wishlist">
                                         {% if user %}
-                                            <a href="wishlist.html"><i class="icofont-heart"></i></a>
+                                            <a href="{{ 'wishlist'|page }}"><i class="icofont-heart"></i></a>
                                         {% else %}
                                             <a href="{{ 'login'|page }}"><i class="icofont-heart"></i></a>
                                         {% endif %}
@@ -139,12 +147,12 @@
                                 </div>
                                 <div class="col-6">
                                     <input class="form-control" type="number" name="max_price"
-                                           placeholder="1350" value="{{input('max_price') ? input('max_price') : null}}">
+                                           placeholder="0" value="{{input('max_price') ? input('max_price') : null}}">
                                 </div>
                             </div>
                         </div>
                        <button type="submit" class="btn btn-primary" style="width: 100%"> Filterle </button>
-                    </form>
+                 
 
                 </div>
             </div>
@@ -156,15 +164,18 @@
                         <div class="col-8">
                         </div>
                         <div class="col-4">
-                            <select class="form-control" id="sort">
+                            <select class="form-control" id="sort" name="sort">
-                                <option selected>Gymmatdan arzana</option>
+                                <option value="">Saýla</option>
-                                <option value="&sortDate=asc">Täzeden könä</option>
+                                <option value="price">Arzandan gymmada</option>
-                                <option value="2">Köneden täzä</option>
+                                <option value="-price">Gymmatdan arzana</option>
-                                <option value="3">Arzandan gymmada</option>
+                                <option value="created_at">Täzeden könä</option>
+                                <option value="-created_at">Köneden täzä</option>
                             </select>
                         </div>
                     </div>
                     
+                    </form>
+
 
                 </div>
 
@@ -174,26 +185,28 @@
                         <!-- Single Product -->
                         <div class="col-9 col-sm-12 col-md-6 col-lg-4">
                             <div class="single-product-area mb-30">
+                            <a href="{{ 'product'|page({id: product.id}) }}">
                                 <div class="product_image">
                                     <!-- Product Image -->
-                                    <img class="normal_img" src="{{ product.images[0].path }}" alt="{{ product.name }}">
+                                    <img class="normal_img" src="{{ product.images[0].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
                                     {% if product_images_count > 1 %}
-                                        <img class="hover_img" src="{{ product.images[1].path }}" alt="">
+                                        <img class="hover_img" src="{{ product.images[1].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
                                     {% endif %}
                                     <div class="product_wishlist">
                                         {% if user %}
-                                            <a href="wishlist.html"><i class="icofont-heart"></i></a>
+                                            <a href="{{ 'wishlist'|page }}"><i class="icofont-heart"></i></a>
                                         {% else %}
                                             <a href="{{ 'login'|page }}"><i class="icofont-heart"></i></a>
                                         {% endif %}
                                     </div>
                                 </div>
+                            </a>
 
                                 <!-- Product Description -->
                                 <div class="product_description">
                                     <!-- Add to cart -->
                                     {% if user %}
-                                        <div class="product_add_to_cart" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">
+                                        <div class="product_add_to_cart addToCard" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">
                                             <input type="hidden" min="1" id="quantity{{ product.id }}" value="1">
                                             <a href="#"><i class="icofont-shopping-cart"></i> Sebede goş</a>
                                         </div>
@@ -206,8 +219,8 @@
                                     <div class="product_quick_view">
                                         <a href="#" data-toggle="modal" data-target="#quickview{{product.id}}"><i class="icofont-eye-alt"></i> Doly maglumat</a>
                                     </div>
-                                    <p class="brand_name"></p>
+                                     <p class="brand_name">{{product.vendor.shop_title}}</p>
-                                    <a href="#">{{ product.name }}</a>
+                                    <a href="{{ 'product'|page({id: product.id}) }}">{{ product.name }}</a>
                                     <h6 class="product-price">{{ product.price }} TMT</h6>
                                 </div>
                             </div>
@@ -221,15 +234,21 @@
                         <nav aria-label="Page navigation">
                             <ul class="pagination pagination-sm justify-content-center">
                                 {% if products.currentPage > 1 %}
-                                    <li class="page-item"><a class="page-link" href="{{ products.previousPageUrl }}">Öňki</a></li>
+                                    <li class="page-item"><a class="page-link" href="{{ products.previousPageUrl }}{{params}}">Öňki</a></li>
                                 {% endif %}
                     
                                 {% for page in range(1, products.lastPage) %}
-                                    <li class="page-item"><a class="page-link" href="{{ products.url(page) }}">{{ page }}</a></li>
+                                    {% if page == products.currentPage %}
+                                        <li class="page-item active"><a class="page-link" href="{{ products.url(page) }}{{params}}">{{ page }}</a></li>
+                                    {% elseif page > products.currentPage - 3 and page < products.currentPage + 3 %}
+                                        <li class="page-item"><a class="page-link" href="{{ products.url(page) }}{{params}}">{{ page }}</a></li>
+                                    {% elseif page == products.currentPage + 3 or page == products.currentPage - 3 %}
+                                        <li>...</li>
+                                    {% endif %}
                                 {% endfor %}
                     
                                 {% if products.lastPage > products.currentPage %}
-                                    <li class="page-item"><a class="page-link" href="{{ products.nextPageUrl }}">Indiki</a></li>
+                                    <li class="page-item"><a class="page-link" href="{{ products.nextPageUrl }}{{params}}">Indiki</a></li>
                                 {% endif %}
                             </ul>
                         </nav>

plugins/tps/birzha/components/orderdetail/default.htm

@@ -0,0 +1,58 @@
+{% set order = __SELF__.order %}
+<!-- Breadcumb Area -->
+<div class="breadcumb_area">
+    <div class="container h-100">
+        <div class="row h-100 align-items-center">
+            <div class="col-12">
+                <h5>Zakaz</h5>
+                <ol class="breadcrumb">
+                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">Esasy sahypa</a></li>
+                    <li class="breadcrumb-item active">Zakaz # {{ order.order_id }}</li>
+                </ol>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- Breadcumb Area -->
+
+<!-- Cart Area -->
+<div class="cart_area section_padding_100_70 clearfix">
+    <div class="container">
+        <div class="row justify-content-between">
+            <div class="col-12">
+                <div class="cart-table">
+                    <div class="table-responsive">
+                        <table class="table table-bordered mb-30">
+                            <thead>
+                                <tr>
+                                    <th scope="col">Surat</th>
+                                    <th scope="col">Haryt ady</th>
+                                    <th scope="col">Mukdary</th>
+                                    <th scope="col">Bahasy</th>
+                                    <th scope="col">Jemi</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                            
+                            {% for item in order.items %}
+                                <tr>
+                                    <td>
+                                        <img src="{{ getProductImage(item.item) }}" alt="{{ getProductName(item.item) }}"/>
+                                        
+                                    </td>
+                                    <td><a href="{{ 'product'|page({id: item.item}) }}">{{ getProductName(item.item) }}</a></td>
+                                    <td>{{ item.qty }}</td>
+                                    <td>{{ item.price }} TMT</td>
+                                    <td>{{ item.qty * item.price }} TMT</td>
+                                </tr>
+                            {% endfor %}
+                                
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- Cart Area End -->

plugins/tps/birzha/components/searchoffers/default.htm

@@ -17,9 +17,9 @@
                         <div class="row">
                             <div class="col-12 col-lg-5">
                                 <div class="quickview_pro_img">
-                                    <img class="first_img" src="{{ product.images[0].path }}" alt="">
+                                    <img class="first_img" src="{{ product.images[0].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
                                     {% if product.images_count > 1 %}
-                                        <img class="hover_img" src="{{ product.images[1].path }}" alt="">
+                                        <img class="hover_img" src="{{ product.images[1].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
                                     {% endif %}
                                 </div>
                             </div>
@@ -40,13 +40,21 @@
                                 <!-- Add to Cart Form -->
                                 <form class="cart" method="post">
                                     <div class="quantity">
-                                        <input type="number" class="qty-text" id="qty" step="1" min="1" max="12" name="quantity" value="1">
+                                        <input type="number" class="qty-text form-control" id="quantity{{ product.id }}" step="1" min="1" value="1">
                                     </div>
-                                    <button type="submit" name="addtocart" value="5" class="cart-submit">Sebede goş</button>
+                                    {% if user %}
+                                     <div class="product_add_to_cart addToCard" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">  
+                                            <a href="#" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">Sebede goş</a>
+                                     </div>
+                                    {% else %}
+                                        <div class="product_add_to_cart" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">  
+                                                <a href="{{ 'login'|page }}" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">Sebede goş</a>
+                                         </div>
+                                    {% endif %}
                                     <!-- Wishlist -->
                                     <div class="modal_pro_wishlist">
                                         {% if user %}
-                                            <a href="wishlist.html"><i class="icofont-heart"></i></a>
+                                            <a href="{{ 'wishlist'|page }}"><i class="icofont-heart"></i></a>
                                         {% else %}
                                             <a href="{{ 'login'|page }}"><i class="icofont-heart"></i></a>
                                         {% endif %}
@@ -131,27 +139,29 @@
                         <!-- Single Product -->
                         <div class="col-9 col-sm-12 col-md-6 col-lg-4">
                             <div class="single-product-area mb-30">
-                                <div class="product_image">
+                                <a href="{{ 'product'|page({id: product.id}) }}">
-                                    <!-- Product Image -->
+                                    <div class="product_image">
-                                    <img class="normal_img" src="{{ product.images[0].path }}" alt="{{ product.name }}">
+                                        <!-- Product Image -->
-                                    {% if product.images_count > 1 %}
+                                        <img class="normal_img" src="{{ product.images[0].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
-                                        <img class="hover_img" src="{{ product.images[1].path }}" alt="{{ product.name }}">
+                                        {% if product.images_count > 1 %}
-                                    {% endif %}
+                                            <img class="hover_img" src="{{ product.images[1].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
-                                    <!-- Wishlist -->
-                                    <div class="product_wishlist">
-                                        {% if user %}
-                                            <a href="wishlist.html"><i class="icofont-heart"></i></a>
-                                        {% else %}
-                                            <a href="{{ 'login'|page }}"><i class="icofont-heart"></i></a>
                                         {% endif %}
+                                        <!-- Wishlist -->
+                                        <div class="product_wishlist">
+                                            {% if user %}
+                                                <a href="{{ 'wishlist'|page }}"><i class="icofont-heart"></i></a>
+                                            {% else %}
+                                                <a href="{{ 'login'|page }}"><i class="icofont-heart"></i></a>
+                                            {% endif %}
+                                        </div>
                                     </div>
-                                </div>
+                                </a>
 
                                 <!-- Product Description -->
                                 <div class="product_description">
                                     <!-- Add to cart -->
                                     {% if user %}
-                                        <div class="product_add_to_cart" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">
+                                        <div class="product_add_to_cart addToCard" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">
                                             <input type="hidden" min="1" id="quantity{{ product.id }}" value="1">
                                             <a href="#"><i class="icofont-shopping-cart"></i> Sebede goş</a>
                                         </div>
@@ -164,8 +174,8 @@
                                     <div class="product_quick_view">
                                         <a href="#" data-toggle="modal" data-target="#quickview{{product.id}}"><i class="icofont-eye-alt"></i> Doly maglumat</a>
                                     </div>
-                                    <p class="brand_name"></p>
+                                     <p class="brand_name">{{product.vendor.shop_title}}</p>
-                                    <a href="#">{{ product.name }}</a>
+                                    <a href="{{ 'product'|page({id: product.id}) }}">{{ product.name }}</a>
                                     <h6 class="product-price">{{ product.price }} TMT</h6>
                                 </div>
                             </div>
@@ -183,7 +193,13 @@
                                 {% endif %}
                     
                                 {% for page in range(1, products.lastPage) %}
-                                    <li class="page-item"><a class="page-link" href="{{ products.url(page) }}{{params}}">{{ page }}</a></li>
+                                    {% if page == products.currentPage %}
+                                        <li class="page-item active"><a class="page-link" href="{{ products.url(page) }}{{params}}">{{ page }}</a></li>
+                                    {% elseif page > products.currentPage - 3 and page < products.currentPage + 3 %}
+                                        <li class="page-item"><a class="page-link" href="{{ products.url(page) }}{{params}}">{{ page }}</a></li>
+                                    {% elseif page == products.currentPage + 3 or page == products.currentPage - 3 %}
+                                        <li>...</li>
+                                    {% endif %}
                                 {% endfor %}
                     
                                 {% if products.lastPage > products.currentPage %}

plugins/tps/birzha/components/shopsettings/default.htm

@@ -26,7 +26,7 @@
         
                         <div class="single_catagory_slide">
                             <a href="{{ 'user-profile'|page({id: user.id}) }}" style="display: inline;">
-                                <img src="{{ user.logo|media|resize(127, 127, { mode: 'crop' }) }}" alt="{{ user.name }}">
+                                <img src="{{ user.logo|media|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ user.name }}">
                             </a>
                             <p class="mt-3">{{ user.name }}</p>
                         </div>

plugins/tps/birzha/components/singleoffer/default.htm

@@ -31,8 +31,8 @@
                             
                                 {% for key, image in product.images %}
                                     <div class="carousel-item {{ key == 0 ? 'active' : '' }}">
-                                        <a class="gallery_img" href="{{ image.path }}" title="{{ product.name }}">
+                                        <a class="gallery_img" href="{{ image.path}}" title="{{ product.name }}">
-                                            <img class="d-block w-100" src="{{ image.path }}" alt="{{ product.name }}">
+                                            <img class="d-block w-100" src="{{ image.path }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
                                         </a>
                                     </div>
                                 {% endfor %}
@@ -72,7 +72,10 @@
 
                         <!-- Overview -->
                         <div class="short_overview mb-4">
-                            <h6>Maglumat</h6>
+                            <div class="row">
+                                <div class="col-2">Satyjy:</div>
+                                <div class="col-10"><a href="{{ 'user-profile'|page({id: product.vendor.id}) }}">{{ product.vendor.shop_title ? product.vendor.shop_title: product.vendor.name }}</a></div>
+                            </div>
                             <p>{{ product.description|raw }}</p>
                         </div>
 
@@ -80,15 +83,29 @@
                         <!-- Add to Cart Form -->
                         <form class="cart clearfix my-5 d-flex flex-wrap align-items-center" method="post">
                             <div class="quantity">
-                                <input type="number" class="qty-text form-control" id="qty2" step="1" min="1" max="12" name="quantity" value="1">
+                                <input type="number" class="qty-text form-control" id="quantity{{ product.id }}" step="1" min="1" value="1">
                             </div>
-                            <button type="submit" name="addtocart" value="5" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">Sebede goş</button>
+                            {% if user %}
+                             <div class="product_add_to_cart addToCard" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">  
+                                    <a href="#" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">Sebede goş</a>
+                             </div>
+                            {% else %}
+                                <div class="product_add_to_cart" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">  
+                                        <a href="{{ 'login'|page }}" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">Sebede goş</a>
+                                 </div>
+                            {% endif %}
+                            
+                            {% if product.files.count > 0 %}
+                                <div class="product_add_to_cart">  
+                                        <a href="{{ product.files[0].path }}" target="_blank" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3" download>3D model</a>
+                                 </div>
+                            {% endif %}
                         </form>
 
                         <!-- Others Info -->
                         <div class="others_info_area mb-3 d-flex flex-wrap">
                             {% if user %}
-                                <a class="add_to_wishlist" href="wishlist.html"><i class="fa fa-heart" aria-hidden="true"></i> Halanlarym</a>
+                                <a class="add_to_wishlist" href="{{ 'wishlist'|page }}"><i class="fa fa-heart" aria-hidden="true"></i> Halanlarym</a>
                             {% else %}
                                 <a class="add_to_wishlist" href="{{ 'login'|page }}"><i class="fa fa-heart" aria-hidden="true"></i> Halanlarym</a>
                             {% endif %}
@@ -194,21 +211,16 @@
                             <div role="tabpanel" class="tab-pane fade" id="addi-info">
                                 <div class="additional_info_area">
                                     <h5>Goşmaça maglumatlar</h5>
-                                    <p>Gelen harydyň hili pes bolan ýagdaýynda näme edip bilerin?
+                                    <p>{{ product.description|raw }}</p>
-                                        <br> <span>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Reprehenderit impedit similique qui, itaque delectus labore.</span></p>
-                                    <p>Zakaz eden harydym gelmedi, onuň ýerine başga zat geldi.
-                                        <br> <span>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Facilis quam voluptatum beatae harum tempore, ab?</span></p>
-                                    <p class="mb-0">Zakazy nädip ýatyryp bilerin?
-                                        <br> <span>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Nostrum eius eum, minima!</span></p>
                                 </div>
                             </div>
 
                             <div role="tabpanel" class="tab-pane fade" id="refund">
                                 <div class="refund_area">
                                     <h6>Harydy yzyna gaýtarmak</h6>
-                                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Culpa quidem, eos eius laboriosam voluptates totam mollitia repellat rem voluptate obcaecati quas fuga similique impedit cupiditate vitae repudiandae. Rem, tenetur placeat!</p>
+                                    <p>Gowy hilli harytlary yzyna gaýtarmagyň möhleti, haryt satylanda başgaça ylalaşylmadyk bolsa, haryt alnan gününden 10 gün. Satyn alyjy tarapyndan harytlary yzyna gaýtarmagyň sebäpleri aşakdakylar bolup biler: </p>
 
-                                    <h6>Näme sebäpden yzyna gaýtarmakçy</h6>
+                                    <h6>Sebäpler</h6>
                                     <ul class="mb-30 ml-30">
                                         <li><i class="icofont-check"></i> Hili pes</li>
                                         <li><i class="icofont-check"></i> Dostawka haýal</li>
@@ -217,13 +229,7 @@
                                     </ul>
 
                                     <h6>Sorag. Gelen harydyň hili pes bolan ýagdaýynda näme edip bilerin?</h6>
-                                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Reprehenderit impedit similique qui, itaque delectus labore.</p>
+                                    <p>Satyn alyjy tarapyndan harytlaryň yzyna gaýtarylmagynyň sebäbi harytlaryň önümçilik kemçiligi (nikasy) bolup biler. Satyn alyjy öndüriji tarapyndan kesgitlenen kepillik möhletinde şeýle harytlaryň yzyna gaýtarylmagyny talap edip biler. Önüm üçin kepillik möhleti öndüriji tarapyndan kesgitlenmedik bolsa, şeýle harytlary yzyna gaýtarmak möhleti 2 (iki) aý.</p>
-
-                                    <h6>Sorag. Zakaz eden harydym gelmedi, onuň ýerine başga zat geldi Näme edip bilerin?.</h6>
-                                    <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Facilis quam voluptatum beatae harum tempore, ab?</p>
-
-                                    <h6>Sorag. Nädip zakazy ýatyryp bilerin?</h6>
-                                    <p class="mb-0">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Nostrum eius eum, minima!</p>
                                 </div>
                             </div>
                         </div>

plugins/tps/birzha/components/singlesale/default.htm

@@ -44,7 +44,7 @@
                                             <tr>
                                                 <td>
                                                     <a href="{{ 'product'|page({id: order.product.id}) }}">
-                                                        <img src="{{ order.product.images[0].thumb(60,60, { mode: 'crop' }) }}" alt="Product">
+                                                        <img src="{{ order.product.images[0].thumb(60,60, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ order.product.name }}">
                                                     </a>
                                                 </td>
                                                 <td>

plugins/tps/birzha/components/sliders/img_slider.htm

@@ -7,21 +7,21 @@
     <!-- Ru -->
     {% if lng == 'ru' %}
     <a href="{{ item.link ? item.link : '#' }}" class="advert_item">
-        <img src="{{ item.slide_img_ru|media }}" alt="">
+        <img src="{{ item.slide_img_ru|media }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi,">
     </a>
     {% endif %}
 
     <!-- Tm -->
     {% if lng == 'tm' %}
     <a href="{{ item.link ? item.link : '#' }}" class="advert_item">
-        <img src="{{ item.slide_img_tm|media }}" alt="">
+        <img src="{{ item.slide_img_tm|media }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi,">
     </a>
     {% endif %}
 
     <!-- En -->
     {% if lng == 'en' %}
     <a href="{{ item.link ? item.link : '#' }}" class="advert_item">
-        <img src="{{ item.slide_img_en|media }}" alt="">
+        <img src="{{ item.slide_img_en|media }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi,">
     </a>
     {% endif %}
     {% endfor %}

plugins/tps/birzha/components/useroffers/default.htm

@@ -1,7 +1,10 @@
 {% set products = __SELF__.userProducts %}
 {% set categories = __SELF__.userCategories %}
-{% set user = __SELF__.user %}
+{% set userProfile = __SELF__.userProfile %}
 {% set params = __SELF__.params %}
+{% set sliders = __SELF__.sliders %}
+
+
 
 
 {% for product in products %}
@@ -18,9 +21,9 @@
                         <div class="row">
                             <div class="col-12 col-lg-5">
                                 <div class="quickview_pro_img">
-                                    <img class="first_img" src="{{ product.images[0].path }}" alt="">
+                                    <img class="first_img" src="{{ product.images[0].path }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
                                     {% if product.images_count > 1 %}
-                                        <img class="hover_img" src="{{ product.images[1].path }}" alt="">
+                                        <img class="hover_img" src="{{ product.images[1].path }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
                                     {% endif %}
                                 </div>
                             </div>
@@ -47,7 +50,7 @@
                                     <!-- Wishlist -->
                                     <div class="modal_pro_wishlist">
                                         {% if user %}
-                                            <a href="wishlist.html"><i class="icofont-heart"></i></a>
+                                            <a href="{{ 'wishlist'|page }}"><i class="icofont-heart"></i></a>
                                         {% else %}
                                             <a href="{{ 'login'|page }}"><i class="icofont-heart"></i></a>
                                         {% endif %}
@@ -81,15 +84,15 @@
 
 
 <!-- Breadcumb Area -->
-<div class="breadcumb_area">
+<div class="breadcumb_area2">
     <div class="container h-100">
         <div class="row h-100 align-items-center">
             <div class="col-12">
-                <h5>Harytlar</h5>
+            <!--     <h5>Harytlar</h5> -->
                 <ol class="breadcrumb">
                     <li class="breadcrumb-item"><a href="{{ 'index'|page }}">Esasy sahypa</a></li>
                     <li class="breadcrumb-item active">Satyjy harytlar</li>
-                    <li class="breadcrumb-item active">{{ user.name }}</li>
+                    <li class="breadcrumb-item active">{{ userProfile.name }}</li>
                 </ol>
             </div>
         </div>
@@ -97,139 +100,31 @@
 </div>
 <!-- Breadcumb Area -->
 
-<section class="shop_grid_area section_padding_50">
-    <div class="container">
 
+{% if userProfile.web1 == "variant1" %}
         
-        <div class="col-12 col-lg-12">
+   {% partial "profile/style1" user=user userProfile=userProfile products=products categories=categories %}
-            <div class="my-account-content mb-50">
    
-                <div class="single_catagory_slide">
+{% elseif userProfile.web1 == "variant2" %} 
-                    <a href="{{ 'user-profile'|page({id: user.id}) }}" style="display: inline;">
-                        <img src="{{ user.logo|media|resize(127, 127, { mode: 'crop' }) }}" alt="{{ user.name }}">
-                    </a>
-                    <p class="mt-3">{{ user.slogan }}</p>
-                </div>
 
+   {% partial "profile/style2" user=user userProfile=userProfile products=products categories=categories %}
    
-                <p>{{ user.description|raw }}</p>
+{% elseif userProfile.web1 == "variant3" %} 
-            </div>
+
-        </div>
+   {% partial "profile/style3" user=user userProfile=userProfile %}
+ 
+{% elseif userProfile.web1 == "variant4" %} 
+
+   {% partial "profile/style4" user=user userProfile=userProfile %}
+   
+{% else %}
+
+    {% partial "profile/style2" user=user userProfile=userProfile %}
+
+{% endif %}
 
 
 
-        <div class="row">
-            <div class="col-12">
-                <div class="shop_by_catagory_slides owl-carousel">
-            
-                    {% for category in categories %}
-                        <div class="single_catagory_slide">
-                            <a href="{{ 'user-profile'|page({id: user.id, slug: category.slug}) }}">
-                                <img src="{{ category.icon|media|resize(127, 127, { mode: 'crop' }) }}" alt="{{ category.name }}">
-                            </a>
-                            <p>{{ category.name }}</p>
-                        </div>
-                    {% endfor %}
-                    
-                </div>
-            </div>
-        </div>
-
-        <div class="row mt-50">
-            <div class="col-12">
-                <!-- Shop Top Sidebar -->
-                <div class="shop_top_sidebar_area d-flex flex-wrap align-items-center justify-content-between">
-                    <div class="row" style="width: 100%">
-                        <div class="col-8">
-                        </div>
-                        <div class="col-4">
-                            <form id="sortOptionUserProfile" method="GET"></form>
-                                <select class="form-control" onchange="sortHandle()" id="sort_input">
-                                    <option value="">Saýlanmadyk</option>
-                                    <option value="-price" {% if input('sort') == '-price' %} selected {% endif %}>Gymmatdan arzana</option>
-                                    <option value="price" {% if input('sort') == 'price' %} selected {% endif %}>Arzandan gymmada</option>
-                                    <option value="-created_at" {% if input('sort') == '-created_at' %} selected {% endif %}>Täzeden könä</option>
-                                    <option value="created_at" {% if input('sort') == 'created_at' %} selected {% endif %}>Köneden täzä</option>
-                                </select>
-                            </form>
-                        </div>
-                    </div>
-
-
-                </div>
-
-                <div class="shop_grid_product_area">
-                    <div class="row justify-content-center">
-                        {% for product in products %}
-                        <!-- Single Product -->
-                        <div class="col-9 col-sm-12 col-md-6 col-lg-4">
-                            <div class="single-product-area mb-30">
-                                <div class="product_image">
-                                    <!-- Product Image -->
-                                    <img class="normal_img" src="{{ product.images[0].path }}" alt="{{ product.name }}">
-                                    {% if product.images_count > 1 %}
-                                        <img class="hover_img" src="{{ product.images[1].path }}" alt="{{ product.name }}">
-                                    {% endif %}
-                                    <!-- Wishlist -->
-                                    <div class="product_wishlist">
-                                        {% if user %}
-                                            <a href="wishlist.html"><i class="icofont-heart"></i></a>
-                                        {% else %}
-                                            <a href="{{ 'login'|page }}"><i class="icofont-heart"></i></a>
-                                        {% endif %}
-                                    </div>
-                                </div>
-
-                                <!-- Product Description -->
-                                <div class="product_description">
-                                    <!-- Add to cart -->
-                                    {% if user %}
-                                        <div class="product_add_to_cart" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">
-                                            <input type="hidden" min="1" id="quantity{{ product.id }}" value="1">
-                                            <a href="#"><i class="icofont-shopping-cart"></i> Sebede goş</a>
-                                        </div>
-                                    {% else %}
-                                        <div class="product_add_to_cart">
-                                            <a href="{{ 'login'|page }}"><i class="icofont-shopping-cart"></i> Sebede goş</a>
-                                        </div>
-                                    {% endif %}
-                                    <!-- Quick View -->
-                                    <div class="product_quick_view">
-                                        <a href="#" data-toggle="modal" data-target="#quickview{{product.id}}"><i class="icofont-eye-alt"></i> Doly maglumat</a>
-                                    </div>
-                                    <p class="brand_name"></p>
-                                    <a href="#">{{ product.name }}</a>
-                                    <h6 class="product-price">{{ product.price }} TMT</h6>
-                                </div>
-                            </div>
-                        </div>
-                        {% endfor %}
-
-                    </div>
-                </div>
-                {% if products.hasPages %}
-                    <div class="shop_pagination_area mt-30">
-                        <nav aria-label="Page navigation">
-                            <ul class="pagination pagination-sm justify-content-center">
-                                {% if products.currentPage > 1 %}
-                                    <li class="page-item"><a class="page-link" href="{{ products.previousPageUrl }}{{params}}">Öňki</a></li>
-                                {% endif %}
-
-                                {% for page in range(1, products.lastPage) %}
-                                    <li class="page-item"><a class="page-link" href="{{ products.url(page) }}{{params}}">{{ page }}</a></li>
-                                {% endfor %}
-
-                                {% if products.lastPage > products.currentPage %}
-                                    <li class="page-item"><a class="page-link" href="{{ products.nextPageUrl }}{{params}}">Indiki</a></li>
-                                {% endif %}
-                            </ul>
-                        </nav>
-                    </div>
-                {% endif %}
-            </div>
-        </div>
-    </div>
-</section>
 
 {% put scripts %}
 <script>

plugins/tps/birzha/models/product/fields.yaml

@@ -110,3 +110,9 @@ tabs:
             span: auto
             type: text
             tab: Status
+        type_title:
+            label: 'Görnüş ady'
+            span: auto
+            type: text
+            comment: 'site-da gorunmeli ady'
+            tab: Status

plugins/tps/birzha/updates/builder_table_update_tps_birzha_products_38.php

@@ -0,0 +1,23 @@
+<?php namespace TPS\Birzha\Updates;
+
+use Schema;
+use October\Rain\Database\Updates\Migration;
+
+class BuilderTableUpdateTpsBirzhaProducts38 extends Migration
+{
+    public function up()
+    {
+        Schema::table('tps_birzha_products', function($table)
+        {
+            $table->string('type_title')->nullable();
+        });
+    }
+    
+    public function down()
+    {
+        Schema::table('tps_birzha_products', function($table)
+        {
+            $table->dropColumn('type_title');
+        });
+    }
+}

plugins/tps/birzha/updates/version.yaml

@@ -446,3 +446,6 @@
 1.0.155:
     - 'Updated table tps_birzha_products'
     - builder_table_update_tps_birzha_products_37.php
+1.0.156:
+    - 'Updated table tps_birzha_products'
+    - builder_table_update_tps_birzha_products_38.php

themes/gurlushyk/assets/js/script.js

@@ -7,6 +7,9 @@ var total_quantity = 0;
 var cardAmount = 0;
 
 const addToCard = (id, price, quantity, name, image, vendor) => {
+    console.log("add to card function");
+    console.log(localStorage.getItem("cartForForm"));
+    console.log(productsForForm);
     var exists = false;
     cart.map((item) => {
        if (item.id === id){
@@ -29,6 +32,9 @@ const addToCard = (id, price, quantity, name, image, vendor) => {
         }
      });
      
+     
+     
+     
     if (!exists){
         cart.push({
             id: id,
@@ -49,11 +55,14 @@ const addToCard = (id, price, quantity, name, image, vendor) => {
     }
     localStorage.setItem("cart", JSON.stringify(cart));
     localStorage.setItem("cartForForm", JSON.stringify(cartForForm));
+    console.log(localStorage.getItem("cartForForm"));
 }
 
 
 window.onload = () => {
+    console.log("window onload");
     cart = JSON.parse(localStorage.getItem("cart")) ?? [];
+    cartForForm = JSON.parse(localStorage.getItem("cartForForm")) ?? [];
     var totalQuantity = 0;
     var totalPrice = 0;
     cart.map((item) => {
@@ -66,7 +75,8 @@ window.onload = () => {
 };
 
 
-$(".product_add_to_cart").on('click', function (){
+$(".addToCard").on('click', function (){
+    console.log("add to card");
     let id = parseInt($(this).data('id'));
     let price = parseFloat($(this).data('price'));
     let quantity = parseInt($("#quantity"+id).val());
@@ -81,6 +91,7 @@ $(".product_add_to_cart").on('click', function (){
 
 
 function updateProducts(){
+    console.log("Product update");
     const cartBody = $("#cartBody");
     cartBody.html('');
     new_product_total_price = 0;

themes/gurlushyk/meta/menus/top-menu.yaml

@@ -1,22 +1,13 @@
 items:
-    -
-        title: 'Esasy sahypa'
-        type: cms-page
-        code: ''
-        reference: index
-        viewBag:
-            locale:
-                ru:
-                    title: ''
-                    url: ''
-            isHidden: '0'
-            cssClass: ''
-            isExternal: '0'
     -
         title: 'Biz barada'
+        nesting: null
         type: cms-page
+        url: null
         code: ''
         reference: about
+        cmsPage: null
+        replace: null
         viewBag:
             locale:
                 ru:
@@ -27,9 +18,13 @@ items:
             isExternal: '0'
     -
         title: Gipsler
+        nesting: null
         type: url
         url: /category-profile/sdfsdfsdf
         code: ''
+        reference: null
+        cmsPage: null
+        replace: null
         viewBag:
             locale:
                 ru:
@@ -41,9 +36,13 @@ items:
         items:
             -
                 title: 'Bezeg Gipsler'
+                nesting: null
                 type: url
                 url: /category/products/bezeg-gipsler
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -54,9 +53,13 @@ items:
                     isExternal: '0'
             -
                 title: Çiteler
+                nesting: null
                 type: url
                 url: /category/products/citeler
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -67,9 +70,13 @@ items:
                     isExternal: '0'
             -
                 title: Karnizlar
+                nesting: null
                 type: url
                 url: /category/products/karnizlar
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -80,9 +87,13 @@ items:
                     isExternal: '0'
             -
                 title: Kalonlar
+                nesting: null
                 type: url
                 url: /category/products/kalonlar
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -93,9 +104,13 @@ items:
                     isExternal: '0'
     -
         title: 'Bezeg Dizaýn'
+        nesting: null
         type: url
         url: /category-profile/bezeg-dizayn
         code: ''
+        reference: null
+        cmsPage: null
+        replace: null
         viewBag:
             locale:
                 ru:
@@ -107,9 +122,13 @@ items:
         items:
             -
                 title: Klassika
+                nesting: null
                 type: url
                 url: /category/products/klassika
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -120,9 +139,13 @@ items:
                     isExternal: '0'
             -
                 title: Lýuks
+                nesting: null
                 type: url
                 url: /category/products/lyuks
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -133,9 +156,13 @@ items:
                     isExternal: '0'
             -
                 title: Modern
+                nesting: null
                 type: url
                 url: /category/products/moder
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -146,9 +173,13 @@ items:
                     isExternal: '0'
     -
         title: Agaçlar
+        nesting: null
         type: url
         url: /category-profile/testq
         code: ''
+        reference: null
+        cmsPage: null
+        replace: null
         viewBag:
             locale:
                 ru:
@@ -160,9 +191,13 @@ items:
         items:
             -
                 title: Mebel
+                nesting: null
                 type: url
                 url: /category/products/mebel
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -173,9 +208,13 @@ items:
                     isExternal: '0'
             -
                 title: Gapylar
+                nesting: null
                 type: url
                 url: /category/products/gapylar
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -186,9 +225,13 @@ items:
                     isExternal: '0'
             -
                 title: Spalny
+                nesting: null
                 type: url
                 url: /category/products/spalny
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -199,9 +242,13 @@ items:
                     isExternal: '0'
             -
                 title: Prihožka
+                nesting: null
                 type: url
                 url: /category/products/prihozka
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -212,9 +259,13 @@ items:
                     isExternal: '0'
             -
                 title: Garderob
+                nesting: null
                 type: url
                 url: /category/products/garderob
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -225,9 +276,13 @@ items:
                     isExternal: '0'
             -
                 title: Kuhnýa
+                nesting: null
                 type: url
                 url: /category/products/kuhnya
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -238,9 +293,13 @@ items:
                     isExternal: '0'
     -
         title: Eýwanlar
+        nesting: null
         type: url
         url: /category-profile/jghjghj
         code: ''
+        reference: null
+        cmsPage: null
+        replace: null
         viewBag:
             locale:
                 ru:
@@ -251,9 +310,13 @@ items:
             isExternal: '0'
     -
         title: Aýnalar
+        nesting: null
         type: url
         url: /category-profile/aynalar
         code: ''
+        reference: null
+        cmsPage: null
+        replace: null
         viewBag:
             locale:
                 ru:
@@ -265,9 +328,13 @@ items:
         items:
             -
                 title: 'Aýnadan Myramor'
+                nesting: null
                 type: url
                 url: /category/products/aynadan-myramorlar
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -278,9 +345,13 @@ items:
                     isExternal: '0'
             -
                 title: 'Dekor Aýna'
+                nesting: null
                 type: url
                 url: /category/products/dekor-ayna
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -291,9 +362,13 @@ items:
                     isExternal: '0'
             -
                 title: 'Duş Kabina'
+                nesting: null
                 type: url
                 url: /category/products/dus-kabina
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -304,9 +379,13 @@ items:
                     isExternal: '0'
             -
                 title: 'Aýna Gapy'
+                nesting: null
                 type: url
                 url: /category/products/ayna-gapy
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -317,9 +396,13 @@ items:
                     isExternal: '0'
             -
                 title: 'Kuhnýa Fartuklar'
+                nesting: null
                 type: url
                 url: /category/products/kuhnya-fartuklar
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -330,9 +413,13 @@ items:
                     isExternal: '0'
             -
                 title: 'Aýna Potoloklar'
+                nesting: null
                 type: url
                 url: /category-profile/aynalar
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -343,9 +430,13 @@ items:
                     isExternal: '0'
             -
                 title: Umiwalnik
+                nesting: null
                 type: url
                 url: /category/products/umiwalnikler
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -356,9 +447,13 @@ items:
                     isExternal: '0'
             -
                 title: Lýustra
+                nesting: null
                 type: url
                 url: /category/products/lyustra
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -369,9 +464,13 @@ items:
                     isExternal: '0'
     -
         title: Lýustralar
+        nesting: null
         type: url
         url: /category-profile/lyustralar
         code: ''
+        reference: null
+        cmsPage: null
+        replace: null
         viewBag:
             locale:
                 ru:
@@ -383,9 +482,13 @@ items:
         items:
             -
                 title: Lýustra
+                nesting: null
                 type: url
                 url: /category/products/lyustra
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -396,9 +499,13 @@ items:
                     isExternal: '0'
             -
                 title: Spotlar
+                nesting: null
                 type: url
                 url: /category/products/spotlar
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -409,9 +516,13 @@ items:
                     isExternal: '0'
             -
                 title: 'Led Lampalar'
+                nesting: null
                 type: url
                 url: /category/products/led-lampalar
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -422,9 +533,13 @@ items:
                     isExternal: '0'
             -
                 title: Wklýuçatel
+                nesting: null
                 type: url
                 url: /category/products/wklyucatel
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -435,9 +550,26 @@ items:
                     isExternal: '0'
     -
         title: '3D Modeller'
+        nesting: null
         type: url
         url: /category-profile/3d-modeller
         code: ''
+        reference: null
+        cmsPage: null
+        replace: null
+        viewBag:
+            locale:
+                ru:
+                    title: ''
+                    url: ''
+            isHidden: '0'
+            cssClass: ''
+            isExternal: '0'
+    -
+        title: 'Habarlaşmak Üçin'
+        type: cms-page
+        code: ''
+        reference: contact-us
         viewBag:
             locale:
                 ru:

themes/gurlushyk/pages/contact-us.htm

@@ -1,4 +1,4 @@
-title = "contact us"
+title = "contact-us"
 url = "/contact-us"
 layout = "default"
 is_hidden = 0

themes/gurlushyk/pages/filter-products.htm

@@ -3,11 +3,11 @@ url = "/products/filter"
 layout = "default"
 is_hidden = 0
 
-[filteredProducts]
-perPage = 12
-sortOrder = "desc"
-
 [session]
 security = "all"
+
+[filteredproducts]
+perPage = 12
+sortOrder = "desc"
 ==
-{% component 'filteredProducts' %}
+{% component 'filteredproducts' %}

themes/gurlushyk/pages/index.htm

@@ -51,7 +51,6 @@ redirect = "index"
 ==
 {% set sliders = builderList.records %}
 {% set brandSliders = builderList2.records %}
-
 {% set categories = builderList4.records %}
 {% set users = builderList5.records %}
 
@@ -107,7 +106,7 @@ redirect = "index"
                     {% for category in categories %}
                         <div class="single_catagory_slide">
                             <a href="{{ 'category-profile'|page({categorySlug: category.slug}) }}">
-                                <img src="{{ category.icon|media|resize(127, 127, { mode: 'crop' }) }}" alt="{{ category.name }}">
+                                <img src="{{ category.icon|media|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ category.name }}">
                             </a>
                             <p>{{ category.name }}</p>
                         </div>
@@ -122,30 +121,32 @@ redirect = "index"
 
 
 
-<!-- Mini slider area-->
-<section class="offer_area">
-    <div class="single-mega cn-col-2 container">
-        <div class="gurl_slider">
-        <div class="megamenu-slides owl-carousel">
 
-                {% for brandSlider in brandSliders %}
+    <!-- Mini slider area-->
-                    <img src="{{ brandSlider.img|media|resize(950) }}" alt="Gurluşyk, Gurluşyk Platforma, Bezeg, Gipsler merkezi">
+    <section class="offer_area">
-                {% endfor %}
+        <div class="single-mega cn-col-2 container">
+            <div class="gurl_slider">
+            <div class="megamenu-slides owl-carousel">
     
+                    {% for brandSlider in brandSliders %}
+                        <img src="{{ brandSlider.img|media|resize(950) }}" alt="Gurluşyk, Gurluşyk Platforma, Bezeg, Gipsler merkezi">
+                    {% endfor %}
+    
+            </div>
+            </div>
         </div>
-        </div>
+    </section>
-    </div>
+    <!-- Mini slider area-->
-</section>
+
-<!-- Mini slider area-->
 
 <!-- Brands Area -->
-<section class="catagories_area home-3 section_padding_70_70">
+<section class="catagories_area home-3 mt-5 section_padding_70_70">
     <div class="container">
         <div class="row justify-content-center">
 
             {% for user in users %}
 
-                    <div class="col-4 col-md-4 col-lg-4">
+                    <div class="col-6 col-sm-6 col-md-4 col-lg-4">
                         <a href="{{ 'user-profile'|page({id: user.id}) }}">
                             <div class="userBannerBg">
                                 <div class="single_catagory">

themes/gurlushyk/pages/my-orders.htm

@@ -0,0 +1,9 @@
+title = "Zakazlarym"
+url = "/my-orders"
+layout = "default"
+is_hidden = 0
+
+[myorders]
+perPage = 12
+==
+{% component 'myorders' %}

themes/gurlushyk/pages/order-cancel.htm

@@ -0,0 +1,27 @@
+title = "Zakazy ýatyrmak"
+url = "/order-cancel"
+layout = "default"
+is_hidden = 0
+==
+<div class="container mt-5 mb-5">
+<div role="tabpanel" class="tab-pane fade active show" id="refund">
+    <div class="refund_area">
+        <h6>Zakazy ýatyrmak</h6>
+        <p> Gowy hilli harytlary yzyna gaýtarmagyň möhleti, haryt satylanda başgaça ylalaşylmadyk bolsa, haryt alnan gününden 10 gün.
+
+Satyn alyjy tarapyndan harytlary yzyna gaýtarmagyň sebäpleri aşakdakylar bolup biler: </p>
+
+        <h6>Sebäpler</h6>
+        <ul class="mb-30 ml-30">
+            <li><i class="icofont-check"></i> Hili pes</li>
+            <li><i class="icofont-check"></i> Dostawka haýal</li>
+            <li><i class="icofont-check"></i> Başga haryt geldi</li>
+            
+        </ul>
+
+        <h6>Sorag. Gelen harydyň hili pes bolan ýagdaýynda näme edip bilerin?</h6>
+        <p>Satyn alyjy tarapyndan harytlaryň yzyna gaýtarylmagynyň sebäbi harytlaryň önümçilik kemçiligi (nikasy) bolup biler. Satyn alyjy öndüriji tarapyndan kesgitlenen kepillik möhletinde şeýle harytlaryň yzyna gaýtarylmagyny talap edip biler. Önüm üçin kepillik möhleti öndüriji tarapyndan kesgitlenmedik bolsa, şeýle harytlary yzyna gaýtarmak möhleti 2 (iki) aý.</p>
+
+    </div>
+</div>
+</div>

themes/gurlushyk/pages/order-detail.htm

@@ -0,0 +1,9 @@
+title = "Zakaz maglumaty"
+url = "/order/:id/detail"
+layout = "default"
+is_hidden = 0
+
+[orderdetail]
+id = "{{ :id }}"
+==
+{% component 'orderdetail' %}

themes/gurlushyk/pages/privacy.htm

@@ -3,8 +3,8 @@ url = "/privacy"
 layout = "default"
 is_hidden = 0
 ==
-<div class="container">
+<div class="container mt-5">
 
-<div class="ty-mainbox-container clearfix"> <div class="ty-mainbox-body"><div class="ty-wysiwyg-content"> <div><p><b><u>“GURLUŞYK”</u></b> </p> <p>GURLUŞYK – это онлайн торговая площадка, объединяющая покупателей и продавцов по всему Туркменистану. Стремление клиентов к более низким ценам, лучшему выбору и удобному обслуживанию остается неизменным, несмотря ни на что. Сегодня все эти предпочтения можно найти на сайте <span style="color: rgb(54, 96, 146);"><a href="http://GURLUŞYK.tm">GURLUŞYK.tm</a></span>.</p> <p>&nbsp; </p> <p><b><u>Заявление о миссии:</u></b> </p> <p>Наша миссия - предоставить экономические возможности предпринимателям, предприятиям и организациям любого размера, и быть самой клиентоориентированной компанией Туркменистана. </p> <p>&nbsp; </p> <p><b><u>Продавцам:</u></b> </p> <p>Мы предлагаем продавцам возможность развивать бизнес с небольшими барьерами для входа, независимо от размера, происхождения или расположения. </p> <p>&nbsp; </p> <p><b><u>Покупателям:</u></b>&nbsp;</p> <p>Мы знаем, что у вас высокие стандарты. На GURLUŞYK вы сможете найти нужные товары по разумной цене - без забот!</p></div> </div> </div> </div>
+<div class="ty-mainbox-container clearfix"> <div class="ty-mainbox-body"><div class="ty-wysiwyg-content"> <div><p><b><u>“GURLUŞYK”</u></b> </p> <p>GURLUŞYK – это онлайн торговая площадка, объединяющая покупателей и продавцов по всему Туркменистану. Стремление клиентов к более низким ценам, лучшему выбору и удобному обслуживанию остается неизменным, несмотря ни на что. Сегодня все эти предпочтения можно найти на сайте <span style="color: rgb(54, 96, 146);"><a href="http://GURLUŞYK.tm">GURLUŞYK.tm</a></span>.</p> <p><b><u>Заявление о миссии:</u></b> </p> <p>Наша миссия - предоставить экономические возможности предпринимателям, предприятиям и организациям любого размера, и быть самой клиентоориентированной компанией Туркменистана. </p> <p><b><u>Продавцам:</u></b> </p> <p>Мы предлагаем продавцам возможность развивать бизнес с небольшими барьерами для входа, независимо от размера, происхождения или расположения. </p> <p><b><u>Покупателям:</u></b>&nbsp;</p> <p>Мы знаем, что у вас высокие стандарты. На GURLUŞYK вы сможете найти нужные товары по разумной цене - без забот!</p></div> </div> </div> </div>
 
 </div>

themes/gurlushyk/pages/return.htm

@@ -0,0 +1,27 @@
+title = "Harydy yzyna gaýtarmak"
+url = "/return"
+layout = "default"
+is_hidden = 0
+==
+<div class="container mt-5 mb-5">
+<div role="tabpanel" class="tab-pane fade active show" id="refund">
+    <div class="refund_area">
+        <h6>Harydy yzyna gaýtarmak</h6>
+        <p> Gowy hilli harytlary yzyna gaýtarmagyň möhleti, haryt satylanda başgaça ylalaşylmadyk bolsa, haryt alnan gününden 10 gün.
+
+Satyn alyjy tarapyndan harytlary yzyna gaýtarmagyň sebäpleri aşakdakylar bolup biler: </p>
+
+        <h6>Sebäpler</h6>
+        <ul class="mb-30 ml-30">
+            <li><i class="icofont-check"></i> Hili pes</li>
+            <li><i class="icofont-check"></i> Dostawka haýal</li>
+            <li><i class="icofont-check"></i> Başga haryt geldi</li>
+            
+        </ul>
+
+        <h6>Sorag. Gelen harydyň hili pes bolan ýagdaýynda näme edip bilerin?</h6>
+        <p>Satyn alyjy tarapyndan harytlaryň yzyna gaýtarylmagynyň sebäbi harytlaryň önümçilik kemçiligi (nikasy) bolup biler. Satyn alyjy öndüriji tarapyndan kesgitlenen kepillik möhletinde şeýle harytlaryň yzyna gaýtarylmagyny talap edip biler. Önüm üçin kepillik möhleti öndüriji tarapyndan kesgitlenmedik bolsa, şeýle harytlary yzyna gaýtarmak möhleti 2 (iki) aý.</p>
+
+    </div>
+</div>
+</div>

themes/gurlushyk/pages/user-profile.htm

@@ -3,9 +3,32 @@ url = "/user-profile/:id/:slug?"
 layout = "default"
 is_hidden = 0
 
+[session]
+security = "all"
+
 [userOffers]
-perPage = 12
+perPage = 24
 slug = "{{ :slug }}"
 id = "{{ :id }}"
 ==
+<?php
+function onStart(){
+    
+    $this["slugq"] = $this->param("slug");    
+    
+    $currentC = TPS\Birzha\Models\Category::where("slug", $this["slugq"])->first();
+    
+    if($currentC){
+        
+        $this["currentC"] = "Harytlar / ".$currentC->name;
+            
+    }else{
+        
+         $this["currentC"] = "Hemme Harytlar";
+            
+    }
+    
+}
+?>
+==
 {% component 'userOffers' %}

themes/gurlushyk/partials/customStyle.htm

@@ -1,7 +1,73 @@
 [viewBag]
 ==
 <style>
+.tagCat{
+    border: 2px solid #d6e6fb;
+    border-radius: 10px;
+    display: inline-block;
+    font-size: 15px;
+    margin-left: 2px !important;
+    padding: 5px 15px; 
+    margin: 15px;
+    margin-bottom: 0px !important;
+    margin-top: 5px !important;
+    background: white;
+    color: #070a57 !important;
+}
 
+
+.tagCat:hover{
+    border: 2px solid #d6e6fb;
+    border-radius: 10px;
+    display: inline-block;
+    font-size: 15px;
+    margin-left: 2px !important;
+    padding: 5px 15px; 
+    margin: 15px;
+    margin-bottom: 0px !important;
+    margin-top: 5px !important;
+    background: #F37B1C;
+    color: white !important;;
+}
+
+.activeCat{
+    background: #F37B1C !important;
+    color: white !important;
+}
+
+
+
+
+.section_padding_50 {
+    padding: 20px 0 !important;
+}
+
+.breadcumb_area2 {
+    position: relative;
+    z-index: 1;
+    width: 100%;
+    height: 45px !important;
+    background-color: #f8f8ff;
+}
+
+.breadcrumb {
+    display: -ms-flexbox;
+    display: flex;
+    -ms-flex-wrap: wrap;
+    flex-wrap: wrap;
+    padding: 0.75rem 1rem;
+    margin-bottom: 0rem;
+    list-style: none;
+    background-color: #f8f8ff;
+    border-radius: 0.25rem;
+    padding-bottom: 9px;
+}
+
+.accountq iframe{
+
+    height: 360px !important;    
+    
+}
 .single_slide {
     position: relative;
     z-index: 1;
@@ -36,6 +102,16 @@
     
 }
 
+
+
+.gurl_slider2 .owl-carousel .owl-stage-outer{
+
+    height: 450px !important;   
+    border: 1px solid gray;
+    border-radius: 10px;
+    
+}
+
 .userBannerTitle{
     
     padding: 5px;
@@ -121,4 +197,16 @@ p{
 }
 
 
+
+
+.my-account-content {
+    position: relative;
+    z-index: 1;
+    padding: 30px;
+    background-color: #f8f8ff;
+    border-radius: 6px;
+    border: 1px solid #b2b2b2;
+}
+
+
 </style>

themes/gurlushyk/partials/footer.htm

@@ -1,62 +1,11 @@
 [viewBag]
 ==
-<section class="special_feature_area pt-5">
+<section class="special_feature_area pt-5" style="padding-top: 20px !important;">
         <div class="container">
             <div class="row">
                 <!-- Single Feature Area -->
-                <div class="col-12 col-sm-6 col-lg-3">
+                <div class="col-12 col-sm-12 col-lg-12" >
-                    <div class="single_feature_area mb-5 d-flex align-items-center">
+                    <p style="    text-align: center;font-weight: bold;color: #f8f8ff;background: #1d2536;padding: 6px;border-radius: 5px;">Goşmaça Maglumatlar üçin habarlaşyp bilersiňiz. 7/24</p>
-                        <div class="feature_icon">
-                            <i class="icofont-ship"></i>
-                            <span><i class="icofont-check-alt"></i></span>
-                        </div>
-                        <div class="feature_content">
-                            <h6>Free Shipping</h6>
-                            <p>For orders above $100</p>
-                        </div>
-                    </div>
-                </div>
-
-                <!-- Single Feature Area -->
-                <div class="col-12 col-sm-6 col-lg-3">
-                    <div class="single_feature_area mb-5 d-flex align-items-center">
-                        <div class="feature_icon">
-                            <i class="icofont-box"></i>
-                            <span><i class="icofont-check-alt"></i></span>
-                        </div>
-                        <div class="feature_content">
-                            <h6>Happy Returns</h6>
-                            <p>7 Days free Returns</p>
-                        </div>
-                    </div>
-                </div>
-
-                <!-- Single Feature Area -->
-                <div class="col-12 col-sm-6 col-lg-3">
-                    <div class="single_feature_area mb-5 d-flex align-items-center">
-                        <div class="feature_icon">
-                            <i class="icofont-money"></i>
-                            <span><i class="icofont-check-alt"></i></span>
-                        </div>
-                        <div class="feature_content">
-                            <h6>100% Money Back</h6>
-                            <p>If product is damaged</p>
-                        </div>
-                    </div>
-                </div>
-
-                <!-- Single Feature Area -->
-                <div class="col-12 col-sm-6 col-lg-3">
-                    <div class="single_feature_area mb-5 d-flex align-items-center">
-                        <div class="feature_icon">
-                            <i class="icofont-live-support"></i>
-                            <span><i class="icofont-check-alt"></i></span>
-                        </div>
-                        <div class="feature_content">
-                            <h6>Dedicated Support</h6>
-                            <p>We provide support 24/7</p>
-                        </div>
-                    </div>
                 </div>
             </div>
         </div>
@@ -71,17 +20,14 @@
                         <h6>Biziň bilen habarlaşmak</h6>
                     </div>
                     <ul class="footer_content">
-                        <li><span>Adres:</span> Bitarap Türkmenistan şaýoly</li>
+                        <li><span>Salgy:</span> Bitarap Türkmenistan şaýoly</li>
-                        <li><span>Telefon belgi:</span> 99365809786</li>
+                        <li><span>Telefon:</span> 99365809786</li>
                         <li><span>Email:</span> gurlushyk@example.com</li>
                     </ul>
                     <div class="footer_social_area mt-15">
                         <a href="#"><i class="fa fa-facebook" aria-hidden="true"></i></a>
                         <a href="#"><i class="fa fa-twitter" aria-hidden="true"></i></a>
                         <a href="#"><i class="fa fa-linkedin" aria-hidden="true"></i></a>
-                        <a href="#"><i class="fa fa-pinterest" aria-hidden="true"></i></a>
-                        <a href="#"><i class="fa fa-dribbble" aria-hidden="true"></i></a>
-                        <a href="#"><i class="fa fa-rss" aria-hidden="true"></i></a>
                     </div>
                 </div>
             </div>
@@ -93,8 +39,13 @@
                         <h6>Sahypalar</h6>
                     </div>
                     <ul class="footer_widget_menu">
-                        <li><a href="#"><i class="icofont-rounded-right"></i> Hasabym</a></li>
+                        {% if user %}
-                        <li><a href="#"><i class="icofont-rounded-right"></i> Halanlarym</a></li>
+                            <li><a href="{{ 'vendor-settings'|page }}"><i class="icofont-rounded-right"></i> Dükanyň sazlamalary</a></li>
+                            <li><a href="{{ 'wishlist'|page }}"><i class="icofont-rounded-right"></i> Halanlarym</a></li>
+                        {% else %}
+                            <li><a href="{{ 'login'|page }}"><i class="icofont-rounded-right"></i> Dükanyň sazlamalary</a></li>
+                            <li><a href="{{ 'login'|page }}"><i class="icofont-rounded-right"></i> Halanlarym</a></li>
+                        {% endif %}
                     </ul>
                 </div>
             </div>
@@ -106,8 +57,8 @@
                         <h6>Sahypalar</h6>
                     </div>
                     <ul class="footer_widget_menu">
-                        <li><a href="#"><i class="icofont-rounded-right"></i> Sebedim</a></li>
+                        <li><a href="{{ 'checkout'|page }}"><i class="icofont-rounded-right"></i> Sebedim</a></li>
-                        <li><a href="#"><i class="icofont-rounded-right"></i> Yzyna gaýtarmak</a></li>
+                        <li><a href="{{ 'return'|page }}"><i class="icofont-rounded-right"></i> Yzyna gaýtarmak</a></li>
                     </ul>
                 </div>
             </div>
@@ -119,7 +70,7 @@
                         <h6>Sahypalar</h6>
                     </div>
                     <ul class="footer_widget_menu">
-                        <li><a href="#"><i class="icofont-rounded-right"></i> Zakazy ýatyrmak</a></li>
+                        <li><a href="{{ 'order-cancel'|page }}"><i class="icofont-rounded-right"></i> Zakazy ýatyrmak</a></li>
                         <li><a href="{{ 'contact'|page }}"><i class="icofont-rounded-right"></i> Habarlaşmak</a></li>
                     </ul>
                 </div>
@@ -129,10 +80,10 @@
             <div class="col-12 col-md-7 col-lg-8 col-xl-3">
                 <div class="single_footer_area mb-100">
                     <div class="footer_heading mb-4">
-                        <h6>Mobil programmalarymyzy ýükläp alyň</h6>
+                        <h6>Mobil programmalarymyz</h6>
                     </div>
                     <div class="apps_download">
-                        <a href="#"><img src="{{'assets/img/core-img/play-store.png'|theme}}" alt="Play Store"></a>
+                        <a href="https://play.google.com/store/apps/details?id=tm.gurlushyk.app.gurlushyk&hl=ru&gl=US" target="_blank"><img src="{{'assets/img/core-img/play-store.png'|theme}}" alt="Play Store"></a>
                         <a href="#"><img src="{{'assets/img/core-img/app-store.png'|theme}}" alt="Apple Store"></a>
                     </div>
                 </div>
@@ -152,13 +103,7 @@
                 </div>
                 <!-- Payment Method -->
                 <div class="col-12 col-md-6">
-                    <div class="payment_method">
+                   
-                        <img src="{{'assets/img/payment-method/paypal.png'|theme}}" alt="">
-                        <img src="{{'assets/img/payment-method/maestro.png'|theme}}" alt="">
-                        <img src="{{'assets/img/payment-method/western-union.png'|theme}}" alt="">
-                        <img src="{{'assets/img/payment-method/discover.png'|theme}}" alt="">
-                        <img src="{{'assets/img/payment-method/american-express.png'|theme}}" alt="">
-                    </div>
                 </div>
             </div>
         </div>

themes/gurlushyk/partials/header.htm

@@ -56,6 +56,11 @@ pageNumber = "{{ :page }}"
             {% endif %}
 
             {% if not user %}
+                <li>
+                    <a href="{{ 'login'|page }}">
+                        Haryt goşmak
+                    </a>
+                </li>
                 <li>
                     <a href="{{ 'login'|page }}">
                         Içeri girmek
@@ -128,12 +133,17 @@ pageNumber = "{{ :page }}"
                     <!-- Account -->
                     <div class="account-area">
                         <div class="user-thumbnail">
-                            <i class="icofont-user" aria-hidden="true"></i>
+                            {% if user %}
+                                <i class="icofont-user" aria-hidden="true"></i>
+                            {% else %}
+                                <a href="{{ 'login'|page }}"><i class="icofont-user" aria-hidden="true"></i></a>
+                            {% endif %}
                         </div>
                         {% if user %}
                             <ul class="user-meta-dropdown">
                                 <li class="user-title"><span>Salam,</span> {{ user.name }}</li>
                                 <li><a href="{{ 'my-offers'|page }}">Harytlarym</a></li>
+                                <li><a href="{{ 'my-orders'|page }}">Zakazlarym</a></li>
                                 <li><a href="{{ 'vendor-settings'|page }}">Dükanyň sazlamalary</a></li>
                                 <li><a href="{{ 'my-comments'|page }}">Teswirler</a></li>
                                 <li><a href="{{ 'vendor-sales'|page }}">Gelen sargytlar</a></li>
@@ -173,7 +183,7 @@ pageNumber = "{{ :page }}"
                                       <li style="font-size: 12px;color: #b2b2b2;margin-left: 15px;"> | </li>  
                                       {% endif %}
                                       
-                                      <li class="megamenu-item"><a href="#">{{ item.title }}</a>
+                                      <li class="megamenu-item"><a href="{{item.url}}">{{ item.title }}</a>
                                             <div class="megamenu">
                                                     <a href="{{item.url}}" style="{% if key == 0 %}padding-left: 0px;{% endif %} font-size: 19px;font-weight: bold;padding-left: 30px;padding-top: 30px;color: #000000;text-decoration: underline;">{{ item.title }}</a>
                                                     <ul class="single-mega cn-col-4">

themes/gurlushyk/partials/home/vip-section.htm

@@ -5,7 +5,7 @@ function onStart(){
     
 $type = $this->type;
 
-$this["productsq"] = TPS\Birzha\Models\Product::where("type", $type)->get();
+$this["productsq"] = TPS\Birzha\Models\Product::where("type", $type)->with("vendor")->get();
 
 }
 ?>

themes/gurlushyk/partials/product/card-item.htm

@@ -1,37 +1,42 @@
 [viewBag]
 ==
 <!-- Single Popular Item -->
-<div class="single_popular_item">
-    <div class="product_image">
-        <!-- Product Image -->
-        <img class="first_img" src="{{ product.images[0].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk Platforma, Bezeg, Gipsler merkezi, {{ product.name }}">
-        {% if product.images_count > 1 %}
-            <img class="hover_img" src="{{ product.images[1].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk Platforma, Bezeg, Gipsler merkezi, {{ product.name }}">
-        {% endif %}
 
-        <!-- Wishlist -->
+<div class="single_popular_item">
-        <div class="product_wishlist">
+    <a href="{{ 'product'|page({id: product.id}) }}">
+        <div class="product_image">
+            <!-- Product Image -->
+            <img class="first_img" src="{{ product.images[0].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk Platforma, Bezeg, Gipsler merkezi, {{ product.name }}">
+            {% if product.images_count > 1 %}
+                <img class="hover_img" src="{{ product.images[1].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk Platforma, Bezeg, Gipsler merkezi, {{ product.name }}">
+            {% endif %}
+    
+            <!-- Wishlist -->
+            <div class="product_wishlist">
+                {% if user %}
+                    <a href="{{ 'wishlist'|page }}"><i class="icofont-heart"></i></a>
+                {% else %}
+                    <a href="{{ 'login'|page }}"><i class="icofont-heart"></i></a>
+                {% endif %}
+            </div>
+            <!-- Add to cart -->
             {% if user %}
-            <a href="wishlist.html"><i class="icofont-heart"></i></a>
+                <div class="product_add_to_cart addToCard" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">
+                    <input type="hidden" min="1" id="quantity{{ product.id }}" value="1">
+                    <a href="#"><i class="icofont-shopping-cart"></i> Sebede goş</a>
+                </div>
             {% else %}
-            <a href="{{ 'login'|page }}"><i class="icofont-heart"></i></a>
+                <div class="product_add_to_cart">
+                    <a href="{{ 'login'|page }}"><i class="icofont-shopping-cart"></i> Sebede goş</a>
+                </div>
             {% endif %}
         </div>
-        <!-- Add to cart -->
+    </a>    
-        {% if user %}
-            <div class="product_add_to_cart" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">
-                <input type="hidden" min="1" id="quantity{{ product.id }}" value="1">
-                <a href="#"><i class="icofont-shopping-cart"></i> Sebede goş</a>
-            </div>
-        {% else %}
-            <div class="product_add_to_cart">
-                <a href="{{ 'login'|page }}"><i class="icofont-shopping-cart"></i> Sebede goş</a>
-            </div>
-        {% endif %}
-    </div>
     <!-- Product Description -->
     <div class="product_description">
-        <h5><a href="{{ 'product'|page({id: product.id}) }}">{{ product.name }}</a></h5>
+        <a class="brand_name" href="{{ 'user-profile'|page({id: product.vendor.id}) }}" style="font-weight: normal;color: gray;">{{product.vendor.shop_title}}</a>
+
+        <h5 style="margin-top: 10px;"><a href="{{ 'product'|page({id: product.id}) }}">{{ product.name }}</a></h5>
         <h6>{{ product.price }} TMT</h6>
     </div>
 </div>

themes/gurlushyk/partials/profile/modal.htm

@@ -0,0 +1,71 @@
+[viewBag]
+==
+<!-- +++++++++++++++++++
+    Bootstrap Default Modals
+    ++++++++++++++++++++ -->
+ 
+        <!-- Modal -->
+        <div class="modal fade" id="exampleModalLong" tabindex="-1" role="dialog" aria-labelledby="exampleModalLongTitle" aria-hidden="true">
+            <div class="modal-dialog" role="document" style="max-width:50%;">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title" id="exampleModalLongTitle">{{userProfile.shop_title}}</h5>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <div style="padding: 10px;border: 1px solid #c7c7c7;background: #ececec;margin-bottom: 30px;border-radius: 5px;">
+                            <div class="row">
+                                <div class="col-md-4" style="align-self: center;">
+                                    <div class="row">
+                                        <div class="col-md-12">
+                                        Iş Wagty: <a>{{userProfile.work_time}}</a>
+                                        </div>
+                                        <div class="col-md-12">
+                                        Telefon: <a href="http://{{userProfile.site}}" target="_blank">{{userProfile.username}}</a>
+                                        </div>
+                                        <div class="col-md-12">
+                                        Site: <a href="http://{{userProfile.site}}" target="_blank">{{userProfile.site}}</a>
+                                        </div>
+                                        <div class="col-md-12">
+                                        TikTok: <a href="http://{{userProfile.tiktok}}" target="_blank">{{userProfile.tiktok}}</a>
+                                        </div>
+                                        <div class="col-md-12">
+                                        Instagram: <a href="http://{{userProfile.instagram}}" target="_blank">{{userProfile.instagram}}</a>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-md-3" style="align-self: center;">
+                                    <div class="row" style="border-left: 1px solid gray;border-right: 1px solid gray;">
+                                        <div class="col-md-12" style="text-align:center;">
+                                            <img src="{{userProfile.qr|media}}" style="width: 150px;border: 1px solid;">
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-md-5" style="align-self: center;">
+                                    <div class="row">
+                                      
+                                        <div class="col-md-12">
+                                          <a><img src="{{userProfile.banner|media}}" style="width: 550px;"></a>
+                                        </div>
+                                        
+                                    </div>
+                                </div>
+                            </div>
+                            
+                        
+                        </div>
+                        {{userProfile.description|raw}}
+                         <div class="accountq">{{userProfile.map|raw}}</div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Ýapmak</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+    <!-- +++++++++++++++++++
+    Bootstrap Default Modals
+    ++++++++++++++++++++ -->

themes/gurlushyk/partials/profile/parallax.htm

@@ -0,0 +1,15 @@
+[viewBag]
+==
+<section class="weekly_deals_area home-3 section_padding_100 jarallax bg-overlay" style="background-image: url({{'home/deals.jpg'|media}});    padding: 50px;">
+    <div class="container">
+        <div class="row">
+            <div class="col-12">
+                <div class="weekly_deals_content text-center">
+                    <h3>{{ userProfile.shop_title }} ({{userProfile.work_time}})</h3>
+                    <p>{{ userProfile.short_description }}</p>
+                    <a href="#" class="btn btn-primary" class="btn btn-primary" data-toggle="modal" data-target="#exampleModalLong" style="animation-delay: 600ms; opacity: 1;">Doly Maglumat</a>
+                </div>
+            </div>
+        </div>
+    </div>
+</section>

themes/gurlushyk/partials/profile/style1.htm

@@ -0,0 +1,193 @@
+[viewBag]
+==
+<section class="shop_grid_area section_padding_50">
+    <div class="container" style="max-width: 1600px !important;">
+            <div class="row">
+                
+                
+                
+                <div class="col-12 col-sm-5 col-md-4 col-lg-3">
+                    <div class="shop_sidebar_area">
+                    
+                        <div class="widget catagory mb-30">
+                            <div style="text-align: center">
+                                  <img src="{{ user.logo|media|resize(200, 200, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ userProfile.name }}" style="width: 60%;border: 5px solid white;border-radius: 10px;box-shadow: 0px 2px 5px #00000038;">
+                            </div>
+                            <h6 class="widget-title" style="margin-top: 25px;text-align: center;font-weight: bold;font-size: 18px;margin-bottom: 2px;">{{ userProfile.shop_title }}</h6>
+                            <p style="text-align: center;font-size: 14px;">{{ userProfile.slogan }}</p>
+                            <hr>
+                            <div class="widget-desc">
+                                <p class="custom-control d-flex align-items-center" style="margin-bottom: 0px;">
+                                    <label style="font-weight: 300;margin-bottom: 0px;">- Iş Wagty: {{ userProfile.work_time }} <span class="text-muted"></span></label>
+                                </p>
+                                <p class="custom-control d-flex align-items-center" style="margin-bottom: 0px;">
+                                    <label style="font-weight: 300;margin-bottom: 0px;">- Telefon: +993 {{ userProfile.username }} <span class="text-muted"></span></label>
+                                </p>
+                               <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModalLong" style="width: 100%;margin-top: 20px;">
+                                   Doly Maglumat
+                                </button>
+                            </div>
+                        </div>
+                    
+                         <div class="widget catagory mb-30">
+                            <h6 class="widget-title" style="margin-bottom: 30px !important;">Kategoriýalar</h6>
+                            <div class="widget-desc">
+                                <a href="{{ 'user-profile'|page({id: userProfile.id, slug: ''}) }}" class="custom-control custom-checkbox d-flex align-items-center mb-3 pl-1" style="font-weight: 300;color: {{ currentC == 'Hemme Harytlar' ? '#ff5722' : '' }};">
+                                    - Hemmesi <span class="text-muted"></span>
+                                </a>
+                                {% for category in categories %}
+                                <a href="{{ 'user-profile'|page({id: userProfile.id, slug: category.slug}) }}" class="custom-control custom-checkbox d-flex align-items-center mb-3 pl-1" style="font-weight: 300;color: {{ category.slug == slugq ? '#ff5722' : '' }};">
+                                    - {{ category.name }} <span class="text-muted"></span>
+                                </a>
+                                 {% endfor %}
+                            </div>
+                        </div>
+                    
+                    </div>
+                </div>
+                
+                <div class="col-12 col-sm-7 col-md-8 col-lg-9">
+                
+                    
+             {% partial "profile/modal" userProfile=userProfile %}
+        
+
+ 
+            
+  
+
+        <div class="row">
+            <div class="col-12">
+                <!-- Shop Top Sidebar -->
+                <div class="shop_top_sidebar_area d-flex flex-wrap align-items-center justify-content-between">
+                    <div class="row" style="width: 100%">
+                        <div class="col-8" style="margin: auto;">
+                            {{currentC}}
+                        </div>
+                        <div class="col-4">
+                            <form id="sortOptionUserProfile" method="GET"></form>
+                                <select class="form-control" onchange="sortHandle()" id="sort_input">
+                                    <option value="">Saýlanmadyk</option>
+                                    <option value="-price" {% if input('sort') == '-price' %} selected {% endif %}>Gymmatdan arzana</option>
+                                    <option value="price" {% if input('sort') == 'price' %} selected {% endif %}>Arzandan gymmada</option>
+                                    <option value="-created_at" {% if input('sort') == '-created_at' %} selected {% endif %}>Täzeden könä</option>
+                                    <option value="created_at" {% if input('sort') == 'created_at' %} selected {% endif %}>Köneden täzä</option>
+                                </select>
+                            </form>
+                        </div>
+                    </div>
+
+
+                </div>
+
+                <div class="shop_grid_product_area">
+                    <div class="row justify-content-start ">
+                        {% for product in products %}
+                        <!-- Single Product -->
+                        <div class="col-4 col-sm-12 col-md-2 col-lg-2">
+                            <div class="single-product-area mb-30">
+                            <a href="{{ 'product'|page({id: product.id}) }}">
+                                <div class="product_image">
+                                    <!-- Product Image -->
+                                    <img class="normal_img" src="{{ product.images[0].thumb(680,700,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
+                                    {% if product_images_count > 1 %}
+                                        <img class="hover_img" src="{{ product.images[1].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
+                                    {% endif %}
+                                    
+                                    {% if product.type_title %}
+                                    <div class="product_badge">
+                                        <span>{{product.type_title}}</span>
+                                    </div>
+                                    {% endif %}
+                                    
+                                    <div class="product_wishlist">
+                                        {% if user %}
+                                            <a href="{{ 'wishlist'|page }}"><i class="icofont-heart"></i></a>
+                                        {% else %}
+                                            <a href="{{ 'login'|page }}"><i class="icofont-heart"></i></a>
+                                        {% endif %}
+                                    </div>
+                                </div>
+                            </a>
+
+                                <!-- Product Description -->
+                                <div class="product_description" style="padding-top: 1px;padding-bottom: 20px;">
+                                    <!-- Add to cart -->
+                                    {% if user %}
+                                        <div class="product_add_to_cart addToCard" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">
+                                            <input type="hidden" min="1" id="quantity{{ product.id }}" value="1">
+                                            <a href="#"><i class="icofont-shopping-cart" style="font-size: 19px;"></i></a>
+                                        </div>
+                                    {% else %}
+                                        <div class="product_add_to_cart">
+                                            <a href="{{ 'login'|page }}"><i class="icofont-shopping-cart" style="font-size: 19px;"></i></a>
+                                        </div>
+                                    {% endif %}
+                                    <!-- Quick View -->
+                                    <div class="product_quick_view">
+                                        <a href="#" data-toggle="modal" data-target="#quickview{{product.id}}"><i class="icofont-eye-alt" style="font-size: 19px;"></i></a>
+                                    </div>
+                                    <p class="brand_name"></p>
+                                    <a href="{{ 'product'|page({id: product.id}) }}">{{ product.name }}</a>
+                                    <h6 class="product-price">{{ product.price }} TMT</h6>
+                                </div>
+                            </div>
+                        </div>
+                        {% endfor %}
+
+                    </div>
+                </div>
+                {% if products.hasPages %}
+                    <div class="shop_pagination_area mt-30">
+                        <nav aria-label="Page navigation">
+                            <ul class="pagination pagination-sm justify-content-center">
+                                {% if products.currentPage > 1 %}
+                                    <li class="page-item"><a class="page-link" href="{{ products.previousPageUrl }}{{params}}">Öňki</a></li>
+                                {% endif %}
+                    
+                                {% for page in range(1, products.lastPage) %}
+                                    {% if page == products.currentPage %}
+                                        <li class="page-item active"><a class="page-link" href="{{ products.url(page) }}{{params}}">{{ page }}</a></li>
+                                    {% elseif page > products.currentPage - 3 and page < products.currentPage + 3 %}
+                                        <li class="page-item"><a class="page-link" href="{{ products.url(page) }}{{params}}">{{ page }}</a></li>
+                                    {% elseif page == products.currentPage + 3 or page == products.currentPage - 3 %}
+                                        <li>...</li>
+                                    {% endif %}
+                                {% endfor %}
+                    
+                                {% if products.lastPage > products.currentPage %}
+                                    <li class="page-item"><a class="page-link" href="{{ products.nextPageUrl }}{{params}}">Indiki</a></li>
+                                {% endif %}
+                            </ul>
+                        </nav>
+                    </div>
+                    {% endif %}
+            </div>
+        </div>
+                
+                </div>
+                
+                
+            </div>
+    
+               
+        {% if sliders.count > 0 %}
+            <!-- Mini slider area-->
+            <section class="offer_area" style="margin-top: 70px;">
+                <div class="single-mega cn-col-2">
+                    <div class="gurl_slider2">
+                    <div class="megamenu-slides owl-carousel">
+            
+                            {% for brandSlider in sliders %}
+                                <img src="{{ brandSlider.img|media|resize(950) }}" alt="Gurluşyk, Gurluşyk Platforma, Bezeg, Gipsler merkezi">
+                            {% endfor %}
+            
+                    </div>
+                    </div>
+                </div>
+            </section>
+            <!-- Mini slider area-->
+        {% endif %}
+
+    </div>
+</section>

themes/gurlushyk/partials/profile/style2.htm

@@ -0,0 +1,134 @@
+[viewBag]
+==
+{% partial "profile/parallax" userProfile=userProfile %}
+
+
+ 
+
+<section class="shop_grid_area section_padding_50">
+    <div class="container" style="max-width: 1600px !important;">   
+    <div class="shop_top_sidebar_area">
+        <div class="row">
+       
+            
+            <div class="col-md-12">
+            
+             <a href="{{ 'user-profile'|page({id: userProfile.id, slug: ''}) }}" class="tagCat {{ currentC == 'Hemme Harytlar' ? 'activeCat' : '' }}"> Hemmesi</a>
+             {% for category in categories %}
+                <a href="{{ 'user-profile'|page({id: userProfile.id, slug: category.slug}) }}" class="tagCat {{ category.slug == slugq ? 'activeCat' : '' }}"> {{ category.name }}</a>
+             {% endfor %}
+            
+            </div>
+        </div>
+    </div>
+ {% partial "profile/modal" userProfile=userProfile %}
+<div class="row">
+            <div class="col-12">
+                <!-- Shop Top Sidebar -->
+                <div class="shop_top_sidebar_area d-flex flex-wrap align-items-center justify-content-between">
+                    <div class="row" style="width: 100%">
+                        <div class="col-8" style="margin: auto;">
+                            {{currentC}}
+                        </div>
+                        <div class="col-4">
+                            <form id="sortOptionUserProfile" method="GET"></form>
+                                <select class="form-control" onchange="sortHandle()" id="sort_input">
+                                    <option value="">Saýlanmadyk</option>
+                                    <option value="-price" {% if input('sort') == '-price' %} selected {% endif %}>Gymmatdan arzana</option>
+                                    <option value="price" {% if input('sort') == 'price' %} selected {% endif %}>Arzandan gymmada</option>
+                                    <option value="-created_at" {% if input('sort') == '-created_at' %} selected {% endif %}>Täzeden könä</option>
+                                    <option value="created_at" {% if input('sort') == 'created_at' %} selected {% endif %}>Köneden täzä</option>
+                                </select>
+                            </form>
+                        </div>
+                    </div>
+
+
+                </div>
+
+                <div class="shop_grid_product_area">
+                    <div class="row justify-content-start ">
+                        {% for product in products %}
+                        <!-- Single Product -->
+                        <div class="col-4 col-sm-12 col-md-2 col-lg-2">
+                            <div class="single-product-area mb-30">
+                            <a href="{{ 'product'|page({id: product.id}) }}">
+                                <div class="product_image">
+                                    <!-- Product Image -->
+                                    <img class="normal_img" src="{{ product.images[0].thumb(680,700,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
+                                    {% if product_images_count > 1 %}
+                                        <img class="hover_img" src="{{ product.images[1].thumb(500,625,{'mode':'crop'}) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ product.name }}">
+                                    {% endif %}
+                                    
+                                    {% if product.type_title %}
+                                    <div class="product_badge">
+                                        <span>{{product.type_title}}</span>
+                                    </div>
+                                    {% endif %}
+                                    
+                                    <div class="product_wishlist">
+                                        {% if user %}
+                                            <a href="{{ 'wishlist'|page }}"><i class="icofont-heart"></i></a>
+                                        {% else %}
+                                            <a href="{{ 'login'|page }}"><i class="icofont-heart"></i></a>
+                                        {% endif %}
+                                    </div>
+                                </div>
+                            </a>
+
+                                <!-- Product Description -->
+                                <div class="product_description" style="padding-top: 1px;padding-bottom: 20px;">
+                                    <!-- Add to cart -->
+                                    {% if user %}
+                                        <div class="product_add_to_cart addToCard" data-id="{{ product.id }}" data-price="{{ product.price }}" data-image="{{ product.images[0].path }}" data-name="{{ product.name }}"  data-vendor="{{ product.vendor.id }}">
+                                            <input type="hidden" min="1" id="quantity{{ product.id }}" value="1">
+                                            <a href="#"><i class="icofont-shopping-cart" style="font-size: 19px;"></i></a>
+                                        </div>
+                                    {% else %}
+                                        <div class="product_add_to_cart">
+                                            <a href="{{ 'login'|page }}"><i class="icofont-shopping-cart" style="font-size: 19px;"></i></a>
+                                        </div>
+                                    {% endif %}
+                                    <!-- Quick View -->
+                                    <div class="product_quick_view">
+                                        <a href="#" data-toggle="modal" data-target="#quickview{{product.id}}"><i class="icofont-eye-alt" style="font-size: 19px;"></i></a>
+                                    </div>
+                                    <p class="brand_name"></p>
+                                    <a href="{{ 'product'|page({id: product.id}) }}">{{ product.name }}</a>
+                                    <h6 class="product-price">{{ product.price }} TMT</h6>
+                                </div>
+                            </div>
+                        </div>
+                        {% endfor %}
+
+                    </div>
+                </div>
+                {% if products.hasPages %}
+                    <div class="shop_pagination_area mt-30">
+                        <nav aria-label="Page navigation">
+                            <ul class="pagination pagination-sm justify-content-center">
+                                {% if products.currentPage > 1 %}
+                                    <li class="page-item"><a class="page-link" href="{{ products.previousPageUrl }}{{params}}">Öňki</a></li>
+                                {% endif %}
+                    
+                                {% for page in range(1, products.lastPage) %}
+                                    {% if page == products.currentPage %}
+                                        <li class="page-item active"><a class="page-link" href="{{ products.url(page) }}{{params}}">{{ page }}</a></li>
+                                    {% elseif page > products.currentPage - 3 and page < products.currentPage + 3 %}
+                                        <li class="page-item"><a class="page-link" href="{{ products.url(page) }}{{params}}">{{ page }}</a></li>
+                                    {% elseif page == products.currentPage + 3 or page == products.currentPage - 3 %}
+                                        <li>...</li>
+                                    {% endif %}
+                                {% endfor %}
+                    
+                                {% if products.lastPage > products.currentPage %}
+                                    <li class="page-item"><a class="page-link" href="{{ products.nextPageUrl }}{{params}}">Indiki</a></li>
+                                {% endif %}
+                            </ul>
+                        </nav>
+                    </div>
+                    {% endif %}
+            </div>
+        </div>
+   </div>
+  </section>

themes/gurlushyk/partials/profile/style3.htm

@@ -0,0 +1,41 @@
+[viewBag]
+==
+<div class="col-12 col-lg-12" style="padding: 0px;margin-bottom: 80px;">
+    <div class="row">
+        <div style="position: absolute;left: 90px;z-index: 40;bottom: 80px;">
+            <a href="{{ 'user-profile'|page({id: user.id}) }}" style="display: inline;"> 
+            <img src="{{ user.logo|media|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ userProfile.name }}" style="width: 100%;border: 10px solid white;border-radius: 10px;box-shadow: 0px 2px 5px #00000038;">
+        </a>
+        </div>
+        <div class="col-md-2">
+        
+        </div>
+        <div class="col-md-10">
+                <div class="my-account-content mb-50">
+                    <div class="row">
+                    
+                    <div class="col-md-1">
+                   
+                    
+                    </div>
+                    
+                    <div class="col-md-10">
+                    
+                    <h3 class="mt-3" style="font-size: 22px;font-weight: bold;">{{ userProfile.shop_title }} ({{userProfile.work_time}})</h3>
+                    <p>{{ userProfile.slogan }}</p>
+                    
+                    
+                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModalLong">
+                       Doly Maglumat
+                    </button>
+                    
+                    </div>
+                       
+            
+                    
+                    </div>
+                </div>
+        </div>
+    </div>
+
+</div>

themes/gurlushyk/partials/profile/style4.htm

@@ -0,0 +1,36 @@
+[viewBag]
+==
+<div class="col-12 col-lg-12" style="padding: 0px;margin-bottom: 50px;margin-top: 120px;">
+    <div class="row" style="justify-content: center;">
+        <div style="position: absolute;left: 41%;right: 41%;z-index: 40;bottom: 250px;">
+            <a href="{{ 'user-profile'|page({id: user.id}) }}" style="display: inline;"> 
+            <img src="{{ user.logo|media|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ userProfile.name }}" style="width: 100%;border: 10px solid white;border-radius: 10px;box-shadow: 0px 2px 5px #00000038;">
+        </a>
+        </div>
+      
+        <div class="col-md-6">
+                <div class="my-account-content mb-50">
+                    <div class="row">
+                  
+                    
+                    <div class="col-md-12" style="text-align: center;">
+                    
+                    <h3 class="mt-3" style="font-size: 22px;font-weight: bold;margin-top: 80px !important">{{ userProfile.shop_title }} ({{userProfile.work_time}})</h3>
+                    <p>{{ userProfile.slogan }}</p>
+                    
+
+                    
+                    <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModalLong">
+                       Doly Maglumat
+                    </button>
+                    
+                    </div>
+                       
+            
+                    
+                    </div>
+                </div>
+        </div>
+    </div>
+
+</div>