all

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

@@ -37,6 +37,76 @@ class BlogPostsApiController extends Controller
     }
     
     
+    public function onGetCategorySubs($catId){
+        
+        $subs = $this->getSubCatsq($catId);               
+        
+        $checkSubs = $this->checkSubs($subs);
+        
+           if($checkSubs == ''){
+              $checkSubs = [];
+           }
+        
+        $allCats = $subs + $checkSubs;
+        
+        
+        //$subCatsAll = Category::whereIn("id", $allCats)->orderBy("primary_key", "ASC")->get();
+        
+        return $allCats;
+        
+    }
+    
+    
+   protected function checkSubs($catIds){
+        $data = '';
+        $subCats = [];
+        foreach ($catIds as $id){
+            $subs = $this->getSubCatsq($id);
+            if(count($subs) > 0){
+                foreach($subs as $subId){
+                    array_unshift($subCats, $subId);
+                }
+                array_unshift($subCats, $id);
+                $data = $subCats;
+            }
+        }  
+        return $data;
+        
+    }
+    
+    protected function getSubCatsq($catId){
+        
+        $categoriesCustoms = Category::where("primary_key", $catId)->select("id", "primary_key")->get()->pluck("id")->toArray();
+        return $categoriesCustoms;
+        
+    }
+    
+    
+    public function getProductsWithAllSubCats(Request $request){
+         $data = $request->all();
+
+        $catIds = $this->onGetCategorySubs($data["category"]);
+        
+        $products = Product::with('categories:id,name')->whereHas('categories', function($q) use($catIds){
+                                $q->whereIn('id', $catIds);
+                            })
+                            ->with([
+                                'translations:locale,model_id,attribute_data',
+                                'images:attachment_id,attachment_type,disk_name,file_name',
+                                'place'
+                            ])
+                            ->withCount(['comments as rating_avg' => function($query) {
+                                $query->select(DB::raw('avg(rating)'));
+                            }])
+                            ->approved()
+                            ->orderBy("id", "DESC")
+                            ->paginate(12);
+                            
+        return response()->json(array("data"=>$products), 200);
+            
+    }
+    
+    
     public function getCategoryDatas(Request $request)
     {
         $path = 'https://gurlushyk.com.tm' . Config::get('cms.storage.media.path');
@@ -45,13 +115,15 @@ class BlogPostsApiController extends Controller
         
        
         
-        $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();
+        $accounts = Category::select("id","name", "icon", "is_file_category", "primary_key")->where('id', $data["category"])
+                                ->with(["users" => function($q){
+                                    $q->where("type", "!=", "simple");
+                                }])
+                                ->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");
+                                                                                                                                    $q->where("is_category", 1)->select("category_id", "user_id", "logo", "banner", "is_instagram");   
                                                                                                                                 }])->get();
-        
-        
         $data = array(
                 "path" => $path,
                 "accounts" => $accounts,
@@ -269,7 +341,7 @@ class BlogPostsApiController extends Controller
         
         $favourite = $this->Favourites::where('user_id', $currentUser->id)
             ->with(['product' => function($q){
-               $q->approved()->with(['images', 'place', 'files', 'translations:locale,model_id,attribute_data']);
+               $q->approved()->withTrashed()->with(['images', 'place', 'files', 'translations:locale,model_id,attribute_data']);
             }])->paginate(9);
         //dd($favourite);
 
@@ -352,10 +424,15 @@ class BlogPostsApiController extends Controller
          $data->pathUrl = 'https://gurlushyk.com.tm' . \Config::get('cms.storage.media.path');
 
          
-         $data->categories[] = array(
+         $all = array(
-                                     "id" => 0,
+                         "id" => 0,
-                                     "name"=> "Hemmesi",
+                         "name"=> "Hemmesi",
-                                 ); 
+                     ); 
+                     
+        //array_unshift($data->categories, $all);
+        //$testq = is_array($data->categories);
+        
+        $data->categories->prepend($all);
         
         return response()->json($data, 200);
     }

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

@@ -10,6 +10,8 @@ use TPS\Birzha\Models\Orders;
 use TPS\Birzha\Models\OrderItems;
 use TPS\Birzha\Models\VendorSales;
 use RainLab\User\Models\User as UserClient;
+use Sms\Sms\Models\SmsSender;
+use RainLab\Translate\Models\Message;
 
 class OrderApiController extends Controller
 {
@@ -51,6 +53,7 @@ class OrderApiController extends Controller
         $order->save();
         
         
+        $this->sendSMS($currentUser->username, Message::trans('success.ordered'));
         //   [{"item":34,"qty":1},{"item":35,"qty":3}]
         
         $orderItem = new OrderItems;
@@ -72,6 +75,12 @@ class OrderApiController extends Controller
             
         }
         
+        $vendorPhones = VendorSales::where("order_id", $order->id)->with("vendor")->groupBy("vendor_id")->get();
+         
+         for ($x = 0; $x < count($vendorPhones); $x++) {
+             $this->sendSMS($vendorPhones[$x]->vendor->username, Message::trans('success.ordered.vendor'));
+         }
+        
         
         if ($order && $orderItem && $vendorSale){
             
@@ -91,7 +100,25 @@ class OrderApiController extends Controller
         
         $currentUser = \JWTAuth::parseToken()->authenticate(); 
         
-        $orders = Orders::where("user_id", $currentUser->id)->with("order_items")->orderBy('id', 'DESC')->paginate(12);
+        //$orders = Orders::where("user_id", $currentUser->id)->with(["order_items"])->orderBy('id', 'DESC')->paginate(12);
+        $orders = VendorSales::with("order")->whereHas('order', function ($query) use($currentUser) {
+                                                    $query->where('user_id', $currentUser->id);
+                                                })->groupBy("order_id")->orderBy("id", "DESC")->paginate(12);
+                                                
+        for ($i = 0; $i < count($orders); $i++) {
+            
+            $products = VendorSales::where("order_id", $orders[$i]->order_id)->with(["product" => function($q){
+                                                                                    $q->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',
+                                                                                        ]);
+                                                                                }])->get();
+            
+            
+            $orders[$i]->products = $products;
+        }
         
         return response()->json($orders, 200);
         //return $this->helpers->apiArrayResponseBuilder(200, 'ok', [$orders]);
@@ -118,7 +145,7 @@ class OrderApiController extends Controller
         
         $currentUser = \JWTAuth::parseToken()->authenticate(); 
         
-        $sales = VendorSales::where('vendor_id', $currentUser->id)->where('order_id', $data["order_id"])->with(['order.user', 'product'])->orderBy('id', 'DESC')->paginate(15);
+        $sales = VendorSales::where('vendor_id', $currentUser->id)->where('order_id', $data["order_id"])->with(['order.user', 'product.images:attachment_id,attachment_type,disk_name,file_name', 'product.place', 'product.vendor:id,name,email,type,logo,banner,shop_title,slogan,is_instagram'])->orderBy('id', 'DESC')->paginate(15);
         
        
         
@@ -201,6 +228,15 @@ class OrderApiController extends Controller
         }
        
     }
+    
+    protected function sendSMS($phone, $message){
+        
+        $smsSender = new SmsSender();
+        $smsSender->phone = (string)'+993'.$phone;
+        $smsSender->message = strval($message);
+        $smsSender->save();
+        
+    }
 
     public static function getAfterFilters() {return [];}
     public static function getBeforeFilters() {return [];}

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

@@ -47,7 +47,7 @@ class ProductsAPIController extends Controller
         $perPage = intval(input('custom_per_page')); // intval protects from injection
 
         try {
-            $products = Product::where('name', 'like', "%".$data["key"]."%")->orWhere('slug','LIKE','%'.$data["key"].'%')->with(['translations:locale,model_id,attribute_data',
+            $products = Product::where('keyword', 'like', "%".$data["key"]."%")->orWhere('name', 'like', "%".$data["key"]."%")->orWhere('slug','LIKE','%'.$data["key"].'%')->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',])->where('status', 'approved')->paginate(15);
@@ -144,7 +144,7 @@ class ProductsAPIController extends Controller
                 $query->select(DB::raw('avg(rating)'));
             }])
             ->where('vendor_id', $seller)
-            ->approved()->orderBy('ends_at', $sortOrder);
+            ->approved()->orderBy('id', $sortOrder);
         }
 
 
@@ -405,6 +405,7 @@ class ProductsAPIController extends Controller
         $product->place_id = $data['place_id'];
         $product->price = $data['price'];
         $product->phone = $data['phone'];
+        $product->stock = $data['stock'];
         
         $product->is_file_product = $data['is_file'];
         
@@ -690,6 +691,8 @@ class ProductsAPIController extends Controller
         
         $attachedProduct->phone = $data['phone'];
         
+        $attachedProduct->stock = $data['stock'];
+        
         $attachedProduct->is_file_product = $data['is_file'];
         
         $attachedProduct->save();

plugins/ahmadfatoni/apigenerator/routes.php

@@ -55,6 +55,8 @@ Route::group(['prefix' =>'api/v1','namespace' =>'AhmadFatoni\ApiGenerator\Contro
     Route::get('account/{id}/datas', 'BlogPostsApiController@getAccountDatas');
     
     Route::get('get/category/datas', 'BlogPostsApiController@getCategoryDatas');
+    
+    Route::get('get/all/sub/products', 'BlogPostsApiController@getProductsWithAllSubCats');
 
     Route::middleware(['\Tymon\JWTAuth\Middleware\GetUserFromToken'])->group(function () {
         Route::delete('delete/account', 'VendorApiController@deleteVendor');

plugins/rainlab/user/components/Account.php

@@ -236,7 +236,7 @@ class Account extends ComponentBase
 
             $rules['login'] = $this->loginAttribute() == UserSettings::LOGIN_USERNAME
                 ? 'required|between:2,255'
-                : 'required|email|between:6,255';
+                : 'email|between:6,255';
 
             $rules['password'] = 'required|between:' . UserModel::getMinPasswordLength() . ',255';
 
@@ -311,6 +311,7 @@ class Account extends ComponentBase
              * Validate input
              */
             $data = post();
+            $data['email'] = $data['username'];
 
             if (!array_key_exists('password_confirmation', $data)) {
                 $data['password_confirmation'] = post('password');

plugins/rainlab/user/models/User.php

@@ -24,7 +24,7 @@ class User extends UserBase
      * Validation rules
      */
     public $rules = [
-        'email'    => 'required|between:6,255|unique:users',
+        'email'    => 'between:6,255|unique:users',
         'avatar'   => 'nullable|image|max:4000',
         'username' => 'required|between:2,255|unique:users',
         'password' => 'required:create|between:8,255|confirmed',

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

@@ -191,7 +191,12 @@ tabs:
             span: auto
             default: variant1
             type: balloon-selector
-            tab: 'Web Wariantlar'
+            tab: 'Web Wariantlar we skidka'
+        web2:
+            label: 'Skidka prosentda gorkez'
+            span: auto
+            type: number
+            tab: 'Web Wariantlar we skidka'
 secondaryTabs:
     fields:
         avatar:

plugins/tps/birzha/Plugin.php

@@ -17,7 +17,7 @@ use Illuminate\Http\Resources\Json\Resource;
 use Session;
 use TPS\Birzha\Actions\MakeGiftAction;
 use Tps\Birzha\Console\MakeGiftToUsers;
-
+use Tps\Birzha\Console\AddKeywordToProducts;
 /**
  * Birzha Plugin Information File
  */
@@ -47,6 +47,7 @@ class Plugin extends PluginBase
     {
         $this->registerConsoleCommand('birzha:databasebackup', DatabaseBackUp::class);
         $this->registerConsoleCommand('birzha:gifttousers', MakeGiftToUsers::class);
+        $this->registerConsoleCommand('birzha:addkeywordtoproducts', AddKeywordToProducts::class);
     }
     public function registerListColumnTypes()
     {
@@ -59,8 +60,7 @@ class Plugin extends PluginBase
 
         ];
     }
-    
+
-    
     public function registerMarkupTags()
     {
         return [

plugins/tps/birzha/classes/Product.php

@@ -2,19 +2,28 @@
 namespace TPS\Birzha\Classes;
 
 use TPS\Birzha\Models\Product as ProductItem;
-
+use Illuminate\Support\Facades\Log;
 
 class Product
 {
     public static function getName($id)
     {
         $product = ProductItem::find($id);
-        return $product->name;
+        if($product){
+            return $product->name;
+        }
+        
+        return "";
     }
 
     public static function getImage($id)
     {
+        Log::info("product id ".$id);
         $product = ProductItem::find($id);
-        return $product->images[0]->path;
+        if($product){
+            return $product->images[0]->path;
+        }
+        return null;
+        
     }
 }

plugins/tps/birzha/components/CategoryProfile.php

@@ -20,6 +20,8 @@ class CategoryProfile extends ComponentBase
     public $users;
     public $products;
     public $subcategories;
+    public $categories;
+    public $cities;
 
     public function componentDetails() {
         return [
@@ -48,6 +50,18 @@ class CategoryProfile extends ComponentBase
         $this->users = $this->getCategoryUsers();
         $this->category = $this->getCategory();
         $this->subcategories = $this->getSubs();
+        $this->categories = $this->getCategories();
+        $this->cities = $this->getCities();
+    }
+    
+    protected function getCategories(){
+        $categories = Category::where('primary_key', 0)->get();
+        return $categories;
+    }
+
+    protected function getCities(){
+        $cities = City::all();
+        return $cities;
     }
 
     protected function getCategory(){
@@ -99,4 +113,70 @@ class CategoryProfile extends ComponentBase
         $favourite->save();
         Flash::success("Haryt halanlaryma goşuldy");
     }
+    
+    public function onGetCategorySubs(){
+        
+        $data = post();
+        
+        $catgegory = null;
+        if(strlen($data["mainCat"]) > 0){
+            $category = Category::where('slug', $data["mainCat"])->first();
+        }
+        
+        $subs = $this->getSubCatsq($category ? $category->id : $data["mainCat"]);               
+        
+        $checkSubs = $this->checkSubs($subs);
+        
+           if($checkSubs == ''){
+              $checkSubs = [];
+           }
+        
+        $allCats = $subs + $checkSubs;
+        
+        $subCatsAll = Category::whereIn("id", $allCats)->orderBy("primary_key", "ASC")->get();
+        
+        return $subCatsAll;
+        
+    }
+    
+    protected function checkSubs($catIds){
+        $data = '';
+        $subCats = [];
+        foreach ($catIds as $id){
+            $subs = $this->getSubCatsq($id);
+            if(count($subs) > 0){
+                foreach($subs as $subId){
+                    array_unshift($subCats, $subId);
+                }
+                array_unshift($subCats, $id);
+                $data = $subCats;
+            }
+        }  
+        return $data;
+    }
+    
+    protected function getSubCatsq($catId){
+        
+        $categoriesCustoms = Category::where("primary_key", $catId)->select("id", "primary_key")->get()->pluck("id")->toArray();
+        return $categoriesCustoms;
+        
+    }
+    
+    
+//----------
+    
+    protected function checking($catIds){
+        $data=[];
+        foreach ($catIds as $id){
+            
+            $subs = $this->getSubCatsq($id);
+                $data[] = $id;
+            if(count($subs) > 0){
+                $data[] = $subs;
+            }
+          
+        }    
+    }
+    
+    
 }

plugins/tps/birzha/components/Checkout.php

@@ -14,6 +14,7 @@ use TPS\Birzha\Models\OrderItems;
 use TPS\Birzha\Models\VendorSales;
 use Flash;
 use Sms\Sms\Models\SmsSender;
+use RainLab\Translate\Models\Message;
 
 class Checkout extends ComponentBase
 {
@@ -51,7 +52,7 @@ class Checkout extends ComponentBase
          
          $userPhone= \Auth::user()->username;
          
-         $this->sendSMS($userPhone, "Siz üstünlikli sargyt etdiňiz.");
+         $this->sendSMS($userPhone, Message::trans('success.ordered'));
             
          $orderItem = new OrderItems;
          $orderItem->order_id = $order->id;
@@ -73,11 +74,14 @@ class Checkout extends ComponentBase
          $vendorPhones = VendorSales::where("order_id", $order->id)->with("vendor")->groupBy("vendor_id")->get();
          
          for ($x = 0; $x < count($vendorPhones); $x++) {
-             $this->sendSMS($vendorPhones[$x]->vendor->username, "Size Gurluşyk platformasyndan sargyt geldi");
+             $this->sendSMS($vendorPhones[$x]->vendor->username, Message::trans('success.ordered.vendor'));
          }
     
          if ($order && $orderItem && $vendorSale){
             Flash::success('Sargyt ugradyldy');
+            return [
+                '#checkoutMainDiv' => $this->renderPartial('@success')
+            ];
          }else{
             Flash::error('Sargyt ugradylmady');
             return 500;

plugins/tps/birzha/components/FilteredProducts.php

@@ -22,6 +22,8 @@ class FilteredProducts extends ComponentBase
     public $products;
     public $params;
     public $category;
+    public $city;
+    public $subCategory;
     public $categories;
     public $cities;
 
@@ -75,10 +77,19 @@ class FilteredProducts extends ComponentBase
 
         $this->params = $params;
         $this->products = $this->loadFiltered();
-        $this->category = $this->getSubCategory();
+        $this->category = $this->getCategory();
+        $this->city = $this->getCity();
+        $this->subCategory = $this->getSubCategory();
         $this->categories = $this->getCategories();
         $this->cities = $this->getCities();
     }
+    
+    protected function getCategory()
+    {
+        $cSlug = \Input::get('category');
+        $category = Category::transWhere('slug', $cSlug, Session::get('rainlab.translate.locale'))->first();
+        return $category;
+    }
 
     protected function getSubCategory()
     {
@@ -89,9 +100,16 @@ class FilteredProducts extends ComponentBase
 
     protected function getCategories()
     {
-        $categories = Category::all();
+        $categories = Category::where('primary_key', '=', 0)->get();
         return $categories;
     }
+    
+    protected function getCity()
+    {
+        $cityId = \Input::get('city');
+        $city = City::find($cityId);
+        return $city;
+    }
 
     protected function getCities()
     {
@@ -113,8 +131,14 @@ class FilteredProducts extends ComponentBase
 
         $perPage = $this->property('perPage');
         $products = Product::query();
-
+        $subCat = \Input::get('subcategory');
-        $cSlug = \Input::get('subcategory');
+        
+        $cSlug = null;
+        if(isset($subCat) && $subCat != ''){
+            $cSlug = $subCat;
+        }else{
+            $cSlug = \Input::get('category');
+        }
         $city = \Input::get('city');
         $minPrice = \Input::get('min_price');
         $maxPrice = \Input::get('max_price');
@@ -124,7 +148,6 @@ class FilteredProducts extends ComponentBase
             $category = Category::transWhere('slug', $cSlug, Session::get('rainlab.translate.locale'))->first();
             if ($category) {
                 $products = $category->products();
-                // $products->withPath("filter?category=".$category->slug);
             } else {
                 $products = null;
             }
@@ -177,4 +200,71 @@ class FilteredProducts extends ComponentBase
         $favourite->save();
         Flash::success("Haryt halanlaryma goşuldy");
     }
+    
+    public function onGetCategorySubs(){
+        
+        $data = post();
+        
+        $catgegory = null;
+        if(strlen($data["mainCat"]) > 0){
+            $category = Category::where('slug', $data["mainCat"])->first();
+        }
+        
+        $subs = $this->getSubCatsq($category ? $category->id : $data["mainCat"]);               
+        
+        $checkSubs = $this->checkSubs($subs);
+        
+           if($checkSubs == ''){
+              $checkSubs = [];
+           }
+        
+        $allCats = $subs + $checkSubs;
+        
+        $subCatsAll = Category::whereIn("id", $allCats)->orderBy("primary_key", "ASC")->get();
+        
+        return $subCatsAll;
+        
+    }
+    
+    protected function checkSubs($catIds){
+        $data = '';
+        $subCats = [];
+        foreach ($catIds as $id){
+            $subs = $this->getSubCatsq($id);
+            if(count($subs) > 0){
+                foreach($subs as $subId){
+                    array_unshift($subCats, $subId);
+                }
+                array_unshift($subCats, $id);
+                $data = $subCats;
+            }
+        }  
+        return $data;
+        
+    }
+    
+    protected function getSubCatsq($catId){
+        
+        $categoriesCustoms = Category::where("primary_key", $catId)->select("id", "primary_key")->get()->pluck("id")->toArray();
+        return $categoriesCustoms;
+        
+    }
+    
+    
+//----------
+    
+    protected function checking($catIds){
+        $data=[];
+        foreach ($catIds as $id){
+            
+            $subs = $this->getSubCatsq($id);
+                $data[] = $id;
+            if(count($subs) > 0){
+                $data[] = $subs;
+            }
+          
+        }    
+    }
+    
+    
 }

plugins/tps/birzha/components/MyOffers.php

@@ -62,7 +62,7 @@ class MyOffers extends ComponentBase
         $perPage = $this->property('perPage');
         return \Auth::user()->products()
             ->orderBy('updated_at', 'desc')
-            ->paginate($perPage);
+            ->paginate(6);
     }
 
     

plugins/tps/birzha/components/OfferForm.php

@@ -17,6 +17,9 @@ use Str;
 use ValidationException;
 use Carbon\Carbon;
 use RainLab\User\Facades\Auth;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Log;
+
 
 class OfferForm extends ComponentBase
 {
@@ -67,10 +70,11 @@ class OfferForm extends ComponentBase
             'name' => 'required',
             'price' => 'required|numeric',
             'state_id' => 'required',
+            'stock' => 'required|numeric|min:0|max:1',
             'description' => 'required',
             'new_img' => 'array|required',
             // 'is_file' => 'required',
-            'new_img.*' => 'mimes:jpg,png|max:1024',
+            'new_img.*' => 'mimes:jpg,png',
             'category_id' => [
                 'required',
                 'exists:tps_birzha_categories,id',
@@ -91,12 +95,22 @@ class OfferForm extends ComponentBase
         }
 
         $category = null;
+        $keyword = $data['name'];
         if(isset($data["subcategory_id"]) && $data["subcategory_id"] != 'null'){
             $category = Category::find($data['subcategory_id']);
         }else{
             $category = Category::find($data['category_id']);
         }
         
+        $keyword = $keyword.' '.$category->name.' '.$category->slug;
+        if($category->primary_key > 0){
+          $keyword = $keyword.' '.$category->parent->name.' '.$category->parent->slug;
+              if($category->parent->primary_key > 0){
+                  $keyword = $keyword.' '.$category->parent->parent->name.' '.$category->parent->parent->slug;
+              }
+        }
+
+        
         $place = null;
         if(isset($data["city_id"]) && $data["city_id"] != 'null'){
             $place = $data['city_id'];
@@ -114,6 +128,8 @@ class OfferForm extends ComponentBase
         $product->price = $data['price'];
         $product->phone = $data['phone'];
         $product->is_file_product = $data['is_file'];
+        $product->stock = $data['stock'];
+        $product->keyword = $keyword;
         $product->created_at = Carbon::now();
         $product->updated_at = Carbon::now();
         
@@ -157,6 +173,9 @@ class OfferForm extends ComponentBase
         }
         $product->save();
         Flash::success('Haryt goşuldy');
+        return [
+            '#mainDiv' => $this->renderPartial('@success')
+        ];
     }
 
 
@@ -166,10 +185,11 @@ class OfferForm extends ComponentBase
             'name' => 'required',
             'price' => 'required|numeric',
             'state_id' => 'required',
+            'stock' => 'required|numeric|min:0|max:1',
             'description' => 'required',
             'new_img' => 'array',
             // 'is_file' => 'required',
-            'new_img.*' => 'mimes:jpg,png|max:1024',
+            'new_img.*' => 'mimes:jpg,png',
             'category_id' => [
                 'required',
                 'exists:tps_birzha_categories,id',
@@ -195,6 +215,18 @@ class OfferForm extends ComponentBase
         if(!$product){
             Flash::error('Haryt tapylmady');
         }
+        
+        $keyword = $data["name"];
+        
+        $keyword = $keyword.' '.$category->name.' '.$category->slug;
+        if($category->primary_key > 0){
+          $keyword = $keyword.' '.$category->parent->name.' '.$category->parent->slug;
+              if($category->parent->primary_key > 0){
+                  $keyword = $keyword.' '.$category->parent->parent->name.' '.$category->parent->parent->slug;
+              }
+        }
+        
+        
         $product->name = $data['name'];
         $product->description = $data['description'];
         $product->short_description = $data['short_description'];
@@ -204,6 +236,8 @@ class OfferForm extends ComponentBase
         $product->price = $data['price'];
         $product->phone = $data['phone'];
         $product->is_file_product = $data['is_file'];
+        $product->stock = $data['stock'];
+        $product->keyword = $keyword;
         $product->updated_at = Carbon::now();
 
         if(isset($data['new_file'])){
@@ -238,7 +272,9 @@ class OfferForm extends ComponentBase
         }
         $product->save();
         Flash::success('Haryt maglumaty üýtgedildi. Tassyklanýança garaşmagyňyzy haýyş edýäris.');
-        return \Redirect::back();
+        return [
+            '#mainDiv' => $this->renderPartial('@editSuccess')
+        ];
     }
 
     // step 2
@@ -391,7 +427,7 @@ class OfferForm extends ComponentBase
     }
 
     public function onRun() {
-        $this->categories = Category::where('status',1)->where('primary_key', '=', 0)->get();
+        $this->categories = Category::where('status',1)->where('primary_key', 0)->get();
         $this->subcategories = Category::where('primary_key','>', 0)->get();
         $this->states = City::where('primary_key','=', 0)->get();
         $this->cities = City::where('primary_key','>', 0)->get();
@@ -407,4 +443,73 @@ class OfferForm extends ComponentBase
             $this->productForEditing = null;
         }
     }
+    
+    
+    public function onGetCategorySubs(){
+        
+        $data = post();
+        
+        $subs = $this->getSubCatsq($data["mainCat"]);               
+        
+        $checkSubs = $this->checkSubs($subs);
+        
+           if($checkSubs == ''){
+              $checkSubs = [];
+           }
+        
+        $allCats = $subs + $checkSubs;
+        
+        
+        $subCatsAll = Category::whereIn("id", $allCats)->orderBy("primary_key", "ASC")->get();
+        
+        return $subCatsAll;
+        
+    }
+    
+    
+   protected function checkSubs($catIds){
+        $data = '';
+        $subCats = [];
+        foreach ($catIds as $id){
+            $subs = $this->getSubCatsq($id);
+            if(count($subs) > 0){
+                foreach($subs as $subId){
+                    array_unshift($subCats, $subId);
+                }
+                array_unshift($subCats, $id);
+                $data = $subCats;
+            }
+        }  
+        return $data;
+        
+    }
+    
+    protected function getSubCatsq($catId){
+        
+        $categoriesCustoms = Category::where("primary_key", $catId)->select("id", "primary_key")->get()->pluck("id")->toArray();
+        return $categoriesCustoms;
+        
+    }
+    
+    
+//----------
+    
+    protected function checking($catIds){
+        $data=[];
+        foreach ($catIds as $id){
+            
+            $subs = $this->getSubCatsq($id);
+                $data[] = $id;
+            if(count($subs) > 0){
+                $data[] = $subs;
+            }
+          
+        }    
+    }
+    
+  
+    
+    
+    
+    
 }

plugins/tps/birzha/components/Offers.php

@@ -96,7 +96,7 @@ class Offers extends ComponentBase
     }
 
     protected function getCategories(){
-        $categories = Category::all();
+        $categories = Category::where('primary_key', '=', 0)->get();
         return $categories;
     }
 
@@ -173,6 +173,68 @@ class Offers extends ComponentBase
         Flash::success("Haryt halanlaryma goşuldy");
     }
     
+    public function onGetCategorySubs(){
+        
+        $data = post();
+        
+        $catgegory = null;
+        if(strlen($data["mainCat"]) > 0){
+            $category = Category::where('slug', $data["mainCat"])->first();
+        }
+        
+        $subs = $this->getSubCatsq($category ? $category->id : $data["mainCat"]);               
+        
+        $checkSubs = $this->checkSubs($subs);
+        
+           if($checkSubs == ''){
+              $checkSubs = [];
+           }
+        
+        $allCats = $subs + $checkSubs;
+        
+        $subCatsAll = Category::whereIn("id", $allCats)->orderBy("primary_key", "ASC")->get();
+        
+        return $subCatsAll;
+        
+    }
+    
+    protected function checkSubs($catIds){
+        $data = '';
+        $subCats = [];
+        foreach ($catIds as $id){
+            $subs = $this->getSubCatsq($id);
+            if(count($subs) > 0){
+                foreach($subs as $subId){
+                    array_unshift($subCats, $subId);
+                }
+                array_unshift($subCats, $id);
+                $data = $subCats;
+            }
+        }  
+        return $data;
+        
+    }
+    
+    protected function getSubCatsq($catId){
+        
+        $categoriesCustoms = Category::where("primary_key", $catId)->select("id", "primary_key")->get()->pluck("id")->toArray();
+        return $categoriesCustoms;
+        
+    }
+ 
+    protected function checking($catIds){
+        $data=[];
+        foreach ($catIds as $id){
+            
+            $subs = $this->getSubCatsq($id);
+                $data[] = $id;
+            if(count($subs) > 0){
+                $data[] = $subs;
+            }
+          
+        }    
+    }
+    
     
     
 }

plugins/tps/birzha/components/OrderDetail.php

@@ -14,6 +14,7 @@ use Validator;
 class OrderDetail extends ComponentBase
 {
     public $order;
+    public $total = 0;
     
     public function componentDetails()
     {

plugins/tps/birzha/components/SearchOffers.php

@@ -67,9 +67,9 @@ class SearchOffers extends ComponentBase
 
         if (isset($sort) && $sort != '') {
             $sort = self::getSort($sort);
-            $products = $products->where('name', 'like', '%'.$title.'%')->withCount("images")->orderBy( $sort[0], $sort[1]);
+            $products = $products->where('keyword', 'like', '%'.$title.'%')->withCount("images")->orderBy( $sort[0], $sort[1]);
         }else{
-            $products = $products->where('name', 'like', '%'.$title.'%')->withCount("images");
+            $products = $products->where('keyword', 'like', '%'.$title.'%')->withCount("images");
         }
 
         $products = $products->with("vendor")->paginate($perPage);

plugins/tps/birzha/components/ShopSettings.php

@@ -41,15 +41,18 @@ class ShopSettings extends ComponentBase
             'slogan' => 'required',
             'description' => 'required',
             'workTime' => 'required',
+            'discount' => 'numeric'
         ];
 
         $this->validateForm($data, $rules);
+        
 
         $user = User::find(\Auth::user()->id);
         $user->shop_title = $data['vendorName'];
         $user->slogan = $data['slogan'];
         $user->description = $data['description'];
         $user->work_time = $data['workTime'];
+        $user->web2 = $data['discount'] ? number_format($data['discount'], 2, '.', '') : null;
         $user->save();
 
         Flash::success('Maglumatlar üýtgedildi');

plugins/tps/birzha/components/SingleSale.php

@@ -2,6 +2,7 @@
 
 use Cms\Classes\ComponentBase;
 use TPS\Birzha\Models\Product;
+use TPS\Birzha\Models\Orders;
 use TPS\Birzha\Models\VendorSales as VSales;
 use Input;
 use Flash;
@@ -48,20 +49,28 @@ class SingleSale extends ComponentBase
         $vendorOrders = VSales::where('order_id', $data["order_id"])->get();
         
         if((count($vendorOrders) != 0) && ($vendorOrders[0]->vendor_id == \Auth::user()->id)){
+            
             for ($i = 0; $i < count($vendorOrders); $i++) {
                 $vendorOrders[$i]->status = "completed";
                 $vendorOrders[$i]->save();
             }
+            
+            $order = Orders::find($data["order_id"]);
+            $order->status = "completed";
+            $order->save();
+            
             Flash::success('Zakaz kabul edildi');
+            return \Redirect::back();
 
         }else{
             Flash::error('Ýalňyşlyk ýüze çykdy');    
+            return \Redirect::back();
         }
     }
 
 
     public function onRun() {
-        $this->order = $this->property('id');
+        $this->order = $this->loadOrder();
         $this->sales = $this->loadSaleOrderDetail();
         
     }
@@ -73,8 +82,16 @@ class SingleSale extends ComponentBase
                                     ->with(['order.user', 'product'])
                                     ->orderBy('id', 'DESC')
                                     ->paginate(15);
+        //dd($sales);
         return $sales;
     }
+    
+    protected function loadOrder() {
+        $order = Orders::where('id', $this->property('id'))->first();
+        return $order;
+    }
+    
+    
 
     
 }

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

@@ -1,14 +1,17 @@
 {% set category = __SELF__.category %}
+{% set categories = __SELF__.categories %}
 {% set users = __SELF__.users %}
 {% set subs = __SELF__.subcategories %}
+{% set cities = __SELF__.cities %}
+{% set counter = 0 %}
 <!-- Breadcumb Area -->
 <div class="breadcumb_area">
     <div class="container h-100">
         <div class="row h-100 align-items-center">
             <div class="col-12">
-                <h5>Kategoriýa</h5>
+                <h5>{{ 'category.Kategoriya'|_ }}</h5>
                 <ol class="breadcrumb">
-                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">Esasy sahypa</a></li>
+                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">{{ 'breadcrumbEsasySahypa'|_ }}</a></li>
                     {% if category.primary_key > 0 %}
                         <li class="breadcrumb-item"><a href="{{ 'category-profile'|page({categorySlug: category.parent.slug}) }}">{{ category.parent.name }}</a></li>
                     {% endif %}
@@ -24,17 +27,44 @@
 <!-- Shop Catagory Area -->
 <div class="shop_by_catagory_area section_padding_0">
     <div class="container">
-   
         <div class="row">
             <div class="col-12">
                 <div class="shop_by_catagory_slides owl-carousel">
                     <!-- Single Slide -->
-                    <div class="single_catagory_slide">
+                    
-                        <a href="{{ 'category-profile'|page({categorySlug: category.slug}) }}">
+                    {% if category.primary_key > 0 %}
-                            <img src="{{ 'assets/img/core-img/hemmesi2.png'|theme|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ subcategory.name }}">
+                    
-                        </a>
+                        {% if category.parent.primary_key > 0 %}
-                        <p>Hemmesi</p>
+                            <div class="single_catagory_slide">
-                    </div>
+                                <a href="{{ 'category-profile'|page({categorySlug: category.parent.parent.slug}) }}">
+                                    <img src="{{ 'assets/img/core-img/hemmesi2.png'|theme|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ subcategory.name }}">
+                                </a>
+                                <p>{{ 'product.Hemmesi'|_ }}</p>
+                            </div>
+                        {% else %}
+                            <div class="single_catagory_slide">
+                                <a href="{{ 'category-profile'|page({categorySlug: category.parent.slug}) }}">
+                                    <img src="{{ 'assets/img/core-img/hemmesi2.png'|theme|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ subcategory.name }}">
+                                </a>
+                                <p>{{ 'product.Hemmesi'|_ }}</p>
+                            </div>
+                        {% endif %}
+                        
+                    {% elseif category.parent.parent %}
+                        <div class="single_catagory_slide">
+                            <a href="{{ 'category-profile'|page({categorySlug: category.parent.parent.slug}) }}">
+                                <img src="{{ 'assets/img/core-img/hemmesi2.png'|theme|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ subcategory.name }}">
+                            </a>
+                            <p>{{ 'product.Hemmesi'|_ }}</p>
+                        </div>
+                    {% else %}
+                        <div class="single_catagory_slide">
+                            <a href="{{ 'category-profile'|page({categorySlug: category.slug}) }}">
+                                <img src="{{ 'assets/img/core-img/hemmesi2.png'|theme|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ subcategory.name }}">
+                            </a>
+                            <p>{{ 'product.Hemmesi'|_ }}</p>
+                        </div>
+                    {% endif %}
                     
                     {% for subcategory in category.subs %}
                             {% if subcategory.subs.count > 0 %}
@@ -88,7 +118,25 @@
 </section>
 <!-- Brands Area -->
 
-{% if category.subs.count == 0 %}
+{% if category.subs.count == 0 and category.products.count == 0 %}
+    {% set counter = 0 %}
+{% elseif category.subs.count > 0 %}
+    {% for sub in category.subs %}
+        {% if sub.products.count > 0 %}
+            {% set counter = counter + 1 %}
+        {% endif %}
+        {% if sub.subs.count > 0 %}
+            {% for subsub in sub.subs %}
+                {% if subsub.products.count > 0 %}
+                    {% set counter = counter + 1 %}
+                {% endif %}
+            {% endfor %}
+        {% endif %}
+    {% endfor %}
+{% endif %}
+
+
+{% if counter == 0 %}
 <div class="container mb-5">
     <div class="row d-block justify-content-center align-items-center">
         <div class="col-6 d-block mx-auto">
@@ -98,7 +146,7 @@
         </div>
         <div class="col-6 d-block mx-auto">
            <div class="text-center">
-              <p>Şu wagtlykça bu bölümde haryt ýok</p>
+              <p>{{ 'product.SuwagtlykcaHarytYok'|_ }}</p>
           </div>
         </div>
       </div>
@@ -107,11 +155,100 @@
     <div class="container">
         <div class="shop_grid_product_area">
             <div class="row justify-content-start">
+            
+                <div class="col-12 col-md-4 col-lg-3">
+                    <div class="shop_sidebar_area">
+                        <form action="{{ 'filter-products'|page }}" id="filter_form" method="GET">
+                            <div class="widget catagory mb-30">
+                                <h6 class="widget-title">{{ 'filter.Kategoriyalar'|_ }}</h6>
+                                <div class="widget-desc">
+                                    <select name="category" class="form-control" id="category" onChange="getCategories(this.value);">
+                                    <option value="">{{ 'filter.KategoriyaSayla'|_ }}</option>
+                                        {% for mainCat in categories %}
+                                            <option value="{{ mainCat.slug }}" {{ mainCat.id == category.id ? 'selected' : ''  }}>{{ mainCat.name }} </option>
+                                        {% endfor %}
+                                    </select>
+                                </div>
+                            </div>
+                        
+                            {% if category.subs|length > 0 %}
+                            <div class="widget catagory mb-30">
+                                <h6 class="widget-title">{{ 'productAdd.IkinjiKategoriya'|_ }}</h6>
+                                <div class="widget-desc">
+                                    <select name="subcategory" class="form-control" id="subcategory">
+                                        <option value="">{{ 'productAdd.Subkategoriya'|_ }}</option>
+                                        {% for item in category.subs %}
+                                            <option value="{{ item.slug }}" {{ item.id == category.id ? 'selected' : ''  }}>{{ item.name }} </option>
+                                            {% if item.subs.count > 0 %}
+                                                {% for subsub in item.subs %}
+                                                    <option value="{{ subsub.slug }}" {{ item.id == subsub.id ? 'selected' : ''  }}>{{ subsub.name }} </option>
+                                                {% endfor %}
+                                            {% endif %}
+                                            
+                                        {% endfor %}
+                                    </select>
+                                </div>
+                            </div>
+                            {% endif %}
+    
+                             <div class="widget brands mb-30">
+                                <h6 class="widget-title">{{ 'filter.Saherler'|_ }}</h6>
+                                <div class="widget-desc">
+                                <select name="city" class="form-control">
+                                    <option value="">{{ 'filter.SaherSayla'|_ }}</option>
+                                    {% for city in cities %}
+                                        <option value="{{ city.id }}">{{ city.name }} </option>
+                                    {% endfor %}
+                                </select>
+                                </div>
+                            </div>
+    
+                            <!-- Single Widget -->
+                            <div class="widget price mb-30">
+                                <h6 class="widget-title">{{ 'filter.Baha'|_ }}</h6>
+                                <div class="row">
+                                    <div class="col-6">
+                                        <input class="form-control" type="number" name="min_price"
+                                               placeholder="0" value="{{input('min_price') ? input('min_price') : null}}">
+                                    </div>
+                                    <div class="col-6">
+                                        <input class="form-control" type="number" name="max_price"
+                                               placeholder="0" value="{{input('max_price') ? input('max_price') : null}}">
+                                    </div>
+                                </div>
+                            </div>
+                           <button type="submit" class="btn btn-primary" style="width: 100%"> {{ 'filter.Filterlemek'|_ }} </button>
+                    </div>
+                </div>
+            
+          <div class="col-12 col-md-8 col-lg-9">
+              <div class="row">
+                <div class="col-12">
+                    <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">
+                                <select class="form-control" onchange="sortHandle()" id="sort_input">
+                                    <option value="">{{ 'sortSaylanmadyk'|_ }}</option>
+                                    <option value="-price" {% if input('sort') == '-price' %} selected {% endif %}>{{ 'sortGymmatdanArzana'|_ }}</option>
+                                    <option value="price" {% if input('sort') == 'price' %} selected {% endif %}>{{ 'sortArzandanGymmada'|_ }}</option>
+                                    <option value="-created_at" {% if input('sort') == '-created_at' %} selected {% endif %}>{{ 'sortTazedenKona'|_ }}</option>
+                                    <option value="created_at" {% if input('sort') == 'created_at' %} selected {% endif %}>{{ 'sortKonedenTaza'|_ }}</option>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                
+                
+             
         {% for subcategory in category.subs %}
             {% if subcategory.subs.count() > 0 %}
                 {% for subsubcategory in subcategory.subs %}
                     {% for product in subsubcategory.products %}
                      <!-- Single Product -->
+                     
                         <div class="col-6 col-xs-6 col-sm-6 col-md-4 col-lg-4">
                             <div class="single-product-area mb-30">
                                 <a href="{{ 'product'|page({id: product.id}) }}">
@@ -143,30 +280,38 @@
                                     {% 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>
+                                            <a href="#"><i class="icofont-shopping-cart"></i> {{ 'product.SebedeGos'|_ }}</a>
                                         </div>
                                     {% else %}
                                         <div class="product_add_to_cart">
-                                            <a href="{{ 'login'|page }}"><i class="icofont-shopping-cart"></i> Sebede goş</a>
+                                            <a href="{{ 'login'|page }}"><i class="icofont-shopping-cart"></i> {{ 'product.SebedeGos'|_ }}</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>
+                                        <a href="#" data-toggle="modal" data-target="#quickview{{product.id}}"><i class="icofont-eye-alt"></i> {{ 'parallaxDolyMaglumat'|_ }}</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>
+                                    <h6 class="product-price">
+                                        {% if product.vendor.web2 > 0 %}
+                                            <del style="color: rgb(253, 0, 24);">{{ product.price }} TMT</del>
+                                                {{ product.getDiscountedPrice(product.vendor.web2) }} TMT
+                                            {% else %}
+                                                {{ product.price }} TMT
+                                        {% endif %}
+                                    </h6>
+                                    <span class="badge mt-2 {{ product.stock == 0 ? 'badge-secondary' : 'badge-success' }}">{{ product.stock == 0 ? 'productAdd.ZakazaGelyar'|_ : 'productAdd.ElimizdeBar'|_ }}</span>
                                 </div>
                             </div>
                         </div>
+                    
                     {% endfor %}
                 {% endfor %}
             {% else %}
             
                 
                 {% for product in subcategory.products %}
-                     <!-- Single Product -->
                         <div class="col-6 col-xs-6 col-sm-6 col-md-4 col-lg-4">
                             <div class="single-product-area mb-30">
                                 <a href="{{ 'product'|page({id: product.id}) }}">
@@ -198,26 +343,36 @@
                                     {% 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>
+                                            <a href="#"><i class="icofont-shopping-cart"></i> {{ 'product.SebedeGos'|_ }}</a>
                                         </div>
                                     {% else %}
                                         <div class="product_add_to_cart">
-                                            <a href="{{ 'login'|page }}"><i class="icofont-shopping-cart"></i> Sebede goş</a>
+                                            <a href="{{ 'login'|page }}"><i class="icofont-shopping-cart"></i> {{ 'product.SebedeGos'|_ }}</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>
+                                        <a href="#" data-toggle="modal" data-target="#quickview{{product.id}}"><i class="icofont-eye-alt"></i> {{ 'parallaxDolyMaglumat'|_ }}</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>
+                                    <h6 class="product-price">
+                                        {% if product.vendor.web2 > 0 %}
+                                            <del style="color: rgb(253, 0, 24);">{{ product.price }} TMT</del>
+                                                {{ product.getDiscountedPrice(product.vendor.web2) }} TMT
+                                            {% else %}
+                                                {{ product.price }} TMT
+                                        {% endif %}
+                                    </h6>
+                                    <span class="badge mt-2 {{ product.stock == 0 ? 'badge-secondary' : 'badge-success' }}">{{ product.stock == 0 ? 'productAdd.ZakazaGelyar'|_ : 'productAdd.ElimizdeBar'|_ }}</span>
                                 </div>
                             </div>
                         </div>
                     {% endfor %}
             {% endif %}
         {% endfor %}
+                </div>
+                </div>
             </div>
         </div>
     </div>
@@ -257,9 +412,16 @@
                                                     <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>
+                                                <h5 class="price">
+                                                    {% if product.vendor.web2 > 0 %}
+                                                        <del style="color: rgb(253, 0, 24);">{{ product.price }} TMT</del>
+                                                            {{ product.getDiscountedPrice(product.vendor.web2) }} TMT
+                                                        {% else %}
+                                                            {{ product.price }} TMT
+                                                    {% endif %}
+                                                </h5> <span class="badge ml-2 {{ product.stock == 0 ? 'badge-secondary' : 'badge-success' }}">{{ product.stock == 0 ? 'productAdd.ZakazaGelyar'|_ : 'productAdd.ElimizdeBar'|_ }}</span>
                                                 <p>{{ html_limit(product.description, 100) }}</p>
-                                                <a href="{{ 'product'|page({id: product.id}) }}">Giňişleýin maglumat</a>
+                                                <a href="{{ 'product'|page({id: product.id}) }}">{{ 'modal.GinisleyinMaglumat'|_ }}</a>
                                             </div>
                                             <!-- Add to Cart Form -->
                                             <form class="cart" method="post">
@@ -268,11 +430,11 @@
                                                 </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>
+                                                        <a href="#" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">{{ 'product.SebedeGos'|_ }}</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>
+                                                            <a href="{{ 'login'|page }}" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">{{ 'product.SebedeGos'|_ }}</a>
                                                      </div>
                                                 {% endif %}
                                                 <!-- Wishlist -->
@@ -331,9 +493,16 @@
                                                     <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>
+                                                <h5 class="price">
+                                                    {% if product.vendor.web2 > 0 %}
+                                                        <del style="color: rgb(253, 0, 24);">{{ product.price }} TMT</del>
+                                                            {{ product.getDiscountedPrice(product.vendor.web2) }} TMT
+                                                        {% else %}
+                                                            {{ product.price }} TMT
+                                                    {% endif %}
+                                                </h5> <span class="badge ml-2 {{ product.stock == 0 ? 'badge-secondary' : 'badge-success' }}">{{ product.stock == 0 ? 'productAdd.ZakazaGelyar'|_ : 'productAdd.ElimizdeBar'|_ }}</span>
                                                 <p>{{ html_limit(product.description, 100) }}</p>
-                                                <a href="{{ 'product'|page({id: product.id}) }}">Giňişleýin maglumat</a>
+                                                <a href="{{ 'product'|page({id: product.id}) }}">{{ 'parallaxGinisleyinMaglumat'|_ }}</a>
                                             </div>
                                             <!-- Add to Cart Form -->
                                             <form class="cart" method="post">
@@ -342,11 +511,11 @@
                                                 </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>
+                                                        <a href="#" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">{{ 'product.SebedeGos'|_ }}</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>
+                                                            <a href="{{ 'login'|page }}" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">{{ 'product.SebedeGos'|_ }}</a>
                                                      </div>
                                                 {% endif %}
                                                 <!-- Wishlist -->
@@ -376,3 +545,45 @@
         {% endif %}
     {% endfor %}
 {% endif %}
+
+{% put scripts %}
+<script>
+    function getCategories(catId) {
+        if(catId == ''){
+            return;
+        }
+        $.request('onGetCategorySubs', {
+        data: {'mainCat': catId},
+        success: function(data) {
+                 if(data.length > 0){
+                     $('#subcategory').prop("disabled", false);
+                     $('#subcategory').html(`<option value="">Subkategoriýa saýla</option>`);
+                     for (var sub of data) {
+                         $('#subcategory').append(`<option value="`+sub.slug+`">`+sub.name+`</option>`);
+                     }
+                 }else{
+                     $('#subcategory').prop("disabled", true);
+                 }
+                
+            }
+        });   
+    }
+    
+    function sortHandle() {
+        event.preventDefault();
+        let sort = document.getElementById("sort_input");
+        let value = sort.value;
+        submitForm(value);
+    }
+
+    function submitForm(value) {
+        let form = document.getElementById("filter_form");
+        let sort = document.createElement("input");
+        sort.name = "sort";
+        sort.type = "hidden";
+        sort.value = value;
+        form.appendChild(sort);
+        form.submit()
+    }
+</script>
+{% endput %}

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

@@ -3,10 +3,10 @@
     <div class="container h-100">
         <div class="row h-100 align-items-center">
             <div class="col-12">
-                <h5>Sebedim</h5>
+                <h5>{{ 'footer.sebedim'|_ }}</h5>
                 <ol class="breadcrumb">
-                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">Esasy sahypa</a></li>
+                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">{{ 'breadcrumbEsasySahypa'|_ }}</a></li>
-                    <li class="breadcrumb-item active">Sebedim</li>
+                    <li class="breadcrumb-item active">{{ 'footer.sebedim'|_ }}</li>
                 </ol>
             </div>
         </div>
@@ -15,8 +15,8 @@
 <!-- Breadcumb Area -->
 
 <!-- Cart Area -->
-<div class="cart_area section_padding_100_70 clearfix">
+<div class="cart_area section_padding_100_70 clearfix" id="checkoutMainDiv">
-    <div class="container">
+    <div class="container" id="containerSection">
         <form action="#" id="checkoutForm" 
                         data-request="onCreateOrder" 
                         data-request-flash
@@ -31,11 +31,11 @@
                         <table class="table table-bordered mb-30">
                             <thead>
                                 <tr>
-                                    <th scope="col">Surat</th>
+                                    <th scope="col">{{ 'checkout.Surat'|_ }}</th>
-                                    <th scope="col">Haryt ady</th>
+                                    <th scope="col">{{ 'checkout.HarytAdy'|_ }}</th>
-                                    <th scope="col">Bahasy</th>
+                                    <th scope="col">{{ 'checkout.Bahasy'|_ }}</th>
-                                    <th scope="col">Mukdary</th>
+                                    <th scope="col">{{ 'checkout.Mukdary'|_ }}</th>
-                                    <th scope="col">Jemi</th>
+                                    <th scope="col">{{ 'checkout.Jemi'|_ }}</th>
                                 </tr>
                             </thead>
                             <tbody id="cartBody">
@@ -49,22 +49,23 @@
                 <div class="col-12 col-lg-6">
                     <div class="cart-apply-coupon mb-30">
                         <div class="coupon-form">
-                            <input type="text" class="form-control" name="address" placeholder="Adresiňiz" required>
+                            <input type="text" class="form-control" name="address" placeholder="{{ 'inputPlaceholder.Adresiniz'|_ }}" required>
-                            <input type="text" class="form-control" name="phone_custom" placeholder="Telefon Belgiňiz">
+                            <span style="position:relative;top: 35px;left: 18px;font-size: 13px;">+993</span>
-                            <textarea class="form-control" id="order-notes" cols="30" rows="10" placeholder="Bellik" name="note" style="height: 90px;" required></textarea>
+                            <input type="number" class="form-control" name="phone_custom" min="61000000" max="65999999" placeholder="{{ 'inputPlaceholder.TelefonBelgi'|_ }}" style="padding-left: 52px;">
+                            <textarea class="form-control" id="order-notes" cols="30" rows="10" placeholder="{{ 'inputPlaceholder.Bellik'|_ }}" name="note" style="height: 90px; padding-top:10px;" required></textarea>
                         </div>
                     </div>
                 </div>
 
             <div class="col-12 col-lg-5">
                 <div class="cart-total-area mb-30">
-                    <h5 class="mb-3">Sebet jemi</h5>
+                    <h5 class="mb-3">{{ 'checkout.SebetJemi'|_ }}</h5>
                     
                         <div class="table-responsive">
                             <table class="table mb-3">
                                 <tbody>
                                     <tr>
-                                        <td>Harytlaryň jemi</td>
+                                        <td>{{ 'checkout.HarytlarynJemi'|_ }}</td>
                                         <td><span id="cardAmount">0</span> TMT</td>
                                     </tr>
                                 </tbody>
@@ -72,7 +73,7 @@
                         </div>
                         <input type="hidden" id="card_amount" name="cardAmount" />
                         <input type="hidden" id="items" name="items" />
-                        <button type="submit" class="btn btn-primary d-block" style="width: 100%;">Zakazy ugratmak</button>
+                        <button type="submit" class="btn btn-primary d-block" style="width: 100%;">{{ 'checkout.ZakazyUgratmak'|_ }}</button>
                     </form>
                 </div>
             </div>
@@ -84,12 +85,10 @@
 {% put scripts %}
 <script>
     function resetForm() {
-        document.getElementById('checkoutForm').reset(); // Reset the form
         localStorage.removeItem("cart");
         localStorage.removeItem("cartForForm");
         localStorage.removeItem("products");
         localStorage.removeItem("productsForForm");
-        location.reload()
     }
     function resetFormFailed() {
         document.getElementById('checkoutForm').reset(); // Reset the form
@@ -98,46 +97,65 @@
 <script>
     window.onload = () => { 
         cart = JSON.parse(localStorage.getItem("cart")) ?? [];
-        cartForForm = JSON.parse(localStorage.getItem("cartForForm")) ?? [];
+        if(cart.length == 0){
-        var totalQuantity = 0;
+            const containerSection = $("#containerSection");
-        var totalPrice = 0;
+            containerSection.html(`
-        cart.map((item) => {
+                <div class="container mb-5">
-            totalQuantity += parseInt(item.quantity);
+            <div class="row d-block justify-content-center align-items-center">
-            totalPrice += parseInt(item.price * item.quantity);
+                <div class="col-6 d-block mx-auto">
-        });
+                   <div class="text-center">
-        $("#cardQuantity").html(totalQuantity);
+                      <img src="{{ 'assets/img/core-img/no-products.png'|theme }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi">
-        $("#cardAmount").html(totalPrice.toFixed(2));
+                  </div>
-        $("#card_amount").val(totalPrice.toFixed(2));
+                </div>
-        $("#items").val(JSON.stringify(cartForForm));
+                <div class="col-6 d-block mx-auto">
-        
+                   <div class="text-center">
-        const cartBody = $("#cartBody");
+                      <p>{{ 'checkout.SebetBos'|_ }}</p>
-        const form = $("#checkoutForm");
+                  </div>
-        cartBody.html('');
+                </div>
-        products = JSON.parse(localStorage.getItem("cart"));
+              </div>
-        productsForForm = JSON.parse(localStorage.getItem("cartForForm"));
+        </div>
-        products.map((item) => {
-            new_product_total_price = parseFloat(new_product_total_price) + parseFloat(item.total);
-            total_quantity = total_quantity + parseInt(item.quantity);
-            cartBody.append(`
-                <tr>
-                    <td>
-                        <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>
-                    <td>
-                        <div class="quantity input-counter">
-                            <span class="minus-btn mr-2" data-id="`+item.id+`"><i class='icofont-minus'></i></span>
-                            <input type="text" value="`+item.quantity+`">
-                            <span class="plus-btn ml-2" data-id="`+item.id+`"><i class='icofont-plus'></i></span>
-                        </div>
-                    </td>
-                    <td>`+item.price * item.quantity+`</td>
-                </tr>
             `);
-
+        }else{
-        });
+            cartForForm = JSON.parse(localStorage.getItem("cartForForm")) ?? [];
-        
+            var totalQuantity = 0;
+            var totalPrice = 0;
+            cart.map((item) => {
+                totalQuantity += parseInt(item.quantity);
+                totalPrice += parseInt(item.price * item.quantity);
+            });
+            $("#cardQuantity").html(totalQuantity);
+            $("#cardAmount").html(totalPrice.toFixed(2));
+            $("#card_amount").val(totalPrice.toFixed(2));
+            $("#items").val(JSON.stringify(cartForForm));
+            
+            const cartBody = $("#cartBody");
+            const form = $("#checkoutForm");
+            cartBody.html('');
+            products = JSON.parse(localStorage.getItem("cart"));
+            productsForForm = JSON.parse(localStorage.getItem("cartForForm"));
+            products.map((item) => {
+                new_product_total_price = parseFloat(new_product_total_price) + parseFloat(item.total);
+                total_quantity = total_quantity + parseInt(item.quantity);
+                cartBody.append(`
+                    <tr>
+                        <td>
+                            <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>
+                        <td>
+                            <div class="quantity input-counter">
+                                <span class="minus-btn mr-2" data-id="`+item.id+`"><i class='icofont-minus'></i></span>
+                                <input type="text" value="`+item.quantity+`">
+                                <span class="plus-btn ml-2" data-id="`+item.id+`"><i class='icofont-plus'></i></span>
+                            </div>
+                        </td>
+                        <td>`+item.price * item.quantity+`</td>
+                    </tr>
+                `);
+    
+            });
+        }
     }
 
     $('body').on('click', '.plus-btn', function(){

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

@@ -0,0 +1,14 @@
+<div class="container mb-5">
+    <div class="row d-block justify-content-center align-items-center">
+        <div class="col-6 d-block mx-auto">
+           <div class="text-center">
+              <img src="{{ 'assets/img/core-img/productAddSuccess.png'|theme }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi">
+          </div>
+        </div>
+        <div class="col-6 d-block mx-auto">
+           <div class="text-center mt-2">
+              <p>{{ 'product.SargytUstunlikliUgradyldy'|_ }}</p>
+          </div>
+        </div>
+      </div>
+</div>

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

@@ -1,7 +1,9 @@
 {% set products = __SELF__.products %}
 {% set category = __SELF__.category %}
+{% set subCategory = __SELF__.subCategory %}
 {% set categories = __SELF__.categories %}
 {% set cities = __SELF__.cities %}
+{% set city = __SELF__.city %}
 {% set params = __SELF__.params %}
 
 <!-- Breadcumb Area -->
@@ -9,11 +11,10 @@
     <div class="container h-100">
         <div class="row h-100 align-items-center">
             <div class="col-12">
-                <h5>Harytlar</h5>
+                <h5>{{ 'breadcrumbHarytlar'|_ }}</h5>
                 <ol class="breadcrumb">
-                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">Esasy sahypa</a></li>
+                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">{{ 'breadcrumbEsasySahypa'|_ }}</a></li>
-                    <li class="breadcrumb-item active">Harytlar</li>
+                    <li class="breadcrumb-item active">{{ 'breadcrumbHarytlar'|_ }}</li>
-                    <li class="breadcrumb-item active">{{ category.name }}</li>
                 </ol>
             </div>
         </div>
@@ -21,30 +22,116 @@
 </div>
 <!-- Breadcumb Area -->
 
+
+<!-- Shop Catagory Area -->
+<div class="shop_by_catagory_area section_padding_0">
+    <div class="container">
+        <div class="row">
+            <div class="col-12">
+                <div class="shop_by_catagory_slides owl-carousel">
+                    <!-- Single Slide -->
+                    
+                    {% if category.primary_key > 0 %}
+                    
+                        {% if category.parent.primary_key > 0 %}
+                            <div class="single_catagory_slide">
+                                <a href="{{ 'category-profile'|page({categorySlug: category.parent.parent.slug}) }}">
+                                    <img src="{{ 'assets/img/core-img/hemmesi2.png'|theme|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ subcategory.name }}">
+                                </a>
+                                <p>{{ 'product.Hemmesi'|_ }}</p>
+                            </div>
+                        {% else %}
+                            <div class="single_catagory_slide">
+                                <a href="{{ 'category-profile'|page({categorySlug: category.parent.slug}) }}">
+                                    <img src="{{ 'assets/img/core-img/hemmesi2.png'|theme|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ subcategory.name }}">
+                                </a>
+                                <p>{{ 'product.Hemmesi'|_ }}</p>
+                            </div>
+                        {% endif %}
+                        
+                    {% elseif category.parent.parent %}
+                        <div class="single_catagory_slide">
+                            <a href="{{ 'category-profile'|page({categorySlug: category.parent.parent.slug}) }}">
+                                <img src="{{ 'assets/img/core-img/hemmesi2.png'|theme|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ subcategory.name }}">
+                            </a>
+                            <p>{{ 'product.Hemmesi'|_ }}</p>
+                        </div>
+                    {% else %}
+                        <div class="single_catagory_slide">
+                            <a href="{{ 'category-profile'|page({categorySlug: category.slug}) }}">
+                                <img src="{{ 'assets/img/core-img/hemmesi2.png'|theme|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ subcategory.name }}">
+                            </a>
+                            <p>{{ 'product.Hemmesi'|_ }}</p>
+                        </div>
+                    {% endif %}
+                    
+                    {% for subcategory in category.subs %}
+                            {% if subcategory.subs.count > 0 %}
+                                <div class="single_catagory_slide">
+                                    <a href="{{ 'category-profile'|page({categorySlug: subcategory.slug}) }}">
+                                        <img src="{{ subcategory.icon|media|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ subcategory.name }}">
+                                    </a>
+                                    <p>{{ subcategory.name }}</p>
+                                </div>
+                            {% else %}
+                                <div class="single_catagory_slide">
+                                    <a href="{{ 'category-products'|page({categorySlug: subcategory.slug}) }}">
+                                        <img src="{{ subcategory.icon|media|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ subcategory.name }}">
+                                    </a>
+                                    <p>{{ subcategory.name }}</p>
+                                </div>
+                            {% endif %}
+                    {% endfor %}
+                    
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- Shop Catagory Area -->
+
+
+
 <section class="shop_grid_area section_padding_100">
     <div class="container">
         <div class="row">
             <div class="col-12 col-sm-5 col-md-4 col-lg-3">
                 <div class="shop_sidebar_area">
                     <form action="{{ 'filter-products'|page }}" method="GET" id="filter_form">
-                        {% if category.subs|length > 0 %}
+                        
                         <div class="widget catagory mb-30">
-                            <h6 class="widget-title">Sub kategoriýalar</h6>
+                            <h6 class="widget-title">{{ 'filter.Kategoriyalar'|_ }}</h6>
                             <div class="widget-desc">
-                                <select name="category" class="form-control" >
+                                <select name="category" class="form-control" id="category" onChange="getCategories(this.value);">
-                                    {% for item in category.subs %}
+                                <option value="">{{ 'filter.KategoriyaSayla'|_ }}</option>
-                                        <option value="{{ item.slug }}" {{ item.id == category.id ? 'selected' : ''  }}>{{ item.name }} </option>
+                                    {% for mainCat in categories %}
+                                        <option value="{{ mainCat.slug }}" {{ mainCat.id == category.id ? 'selected' : ''  }}>{{ mainCat.name }} </option>
                                     {% endfor %}
                                 </select>
                             </div>
                         </div>
-                        {% endif %}
+                        
+                        <div class="widget catagory mb-30">
+                            <h6 class="widget-title">{{ 'productAdd.IkinjiKategoriya'|_ }}</h6>
+                            <div class="widget-desc">
+                                <select name="subcategory" class="form-control" id="subcategory">
+                                    <option value="">{{ 'productAdd.Subkategoriya'|_ }}</option>
+                                    {% for sub in category.subs %}
+                                        <option value="{{ sub.slug }}" {{ subCategory.id == sub.id ? 'selected' : ''  }}>{{ sub.name }} </option>
+                                        {% for subSub in sub.subs %}
+                                            <option value="{{ subSub.slug }}" {{ subCategory.id == subSub.id ? 'selected' : ''  }}>{{ subSub.name }} </option>
+                                        {% endfor %}
+                                    {% endfor %}
+                                </select>
+                            </div>
+                        </div>
+                        
 
                          <div class="widget brands mb-30">
-                            <h6 class="widget-title">Şäherler</h6>
+                            <h6 class="widget-title">{{ 'filter.Saherler'|_ }}</h6>
                             <div class="widget-desc">
                             <select name="city" class="form-control">
-                                <option value="">Şäher saýla</option>
+                                <option value="">{{ 'filter.SaherSayla'|_ }}</option>
                                 {% for city in cities %}
                                     <option value="{{ city.id }}" {% if input('city') == city.id %} selected {% endif %}>{{ city.name }} </option>
                                 {% endfor %}
@@ -54,7 +141,7 @@
 
                         <!-- Single Widget -->
                         <div class="widget price mb-30">
-                            <h6 class="widget-title">Baha</h6>
+                            <h6 class="widget-title">{{ 'filter.Baha'|_ }}</h6>
                             <div class="row">
                                 <div class="col-6">
                                     <input class="form-control" type="number" name="min_price"
@@ -66,7 +153,7 @@
                                 </div>
                             </div>
                         </div>
-                       <button type="submit" class="btn btn-primary" style="width: 100%"> Filterle </button>
+                       <button type="submit" class="btn btn-primary" style="width: 100%"> {{ 'filter.Filterlemek'|_ }} </button>
                     </form>
 
                 </div>
@@ -80,11 +167,11 @@
                         </div>
                         <div class="col-4">
                             <select class="form-control" onchange="sortHandle()" id="sort_input">
-                                <option value="">Saýlanmadyk</option>
+                                <option value="">{{ 'sortSaylanmadyk'|_ }}</option>
-                                <option value="-price" {% if input('sort') == '-price' %} selected {% endif %}>Gymmatdan arzana</option>
+                                <option value="-price" {% if input('sort') == '-price' %} selected {% endif %}>{{ 'sortGymmatdanArzana'|_ }}</option>
-                                <option value="price" {% if input('sort') == 'price' %} selected {% endif %}>Arzandan gymmada</option>
+                                <option value="price" {% if input('sort') == 'price' %} selected {% endif %}>{{ 'sortArzandanGymmada'|_ }}</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 %}>{{ 'sortTazedenKona'|_ }}</option>
-                                <option value="created_at" {% if input('sort') == 'created_at' %} selected {% endif %}>Köneden täzä</option>
+                                <option value="created_at" {% if input('sort') == 'created_at' %} selected {% endif %}>{{ 'sortKonedenTaza'|_ }}</option>
                             </select>
                         </div>
                     </div>
@@ -120,9 +207,16 @@
                                                             <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>
+                                                        <h5 class="price">
+                                                            {% if product.vendor.web2 > 0 %}
+                                                                <del style="color: rgb(253, 0, 24);">{{ product.price }} TMT</del>
+                                                                    {{ product.getDiscountedPrice(product.vendor.web2) }} TMT
+                                                                {% else %}
+                                                                    {{ product.price }} TMT
+                                                            {% endif %}
+                                                        </h5> <span class="badge ml-2 {{ product.stock == 0 ? 'badge-secondary' : 'badge-success' }}">{{ product.stock == 0 ? 'productAdd.ZakazaGelyar'|_ : 'productAdd.ElimizdeBar'|_ }}</span>
                                                         <p>{{ html_limit(product.description, 100) }}</p>
-                                                        <a href="{{ 'product'|page({id: product.id}) }}">Giňişleýin maglumat</a>
+                                                        <a href="{{ 'product'|page({id: product.id}) }}">{{ 'modal.GinisleyinMaglumat'|_ }}</a>
                                                     </div>
                                                     <!-- Add to Cart Form -->
                                                     <form class="cart" method="post">
@@ -131,11 +225,11 @@
                                                         </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>
+                                                                <a href="#" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">{{ 'product.SebedeGos'|_ }}</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>
+                                                                    <a href="{{ 'login'|page }}" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">{{ 'product.SebedeGos'|_ }}</a>
                                                              </div>
                                                         {% endif %}
                                                         <!-- Wishlist -->
@@ -175,7 +269,7 @@
                             </div>
                             <div class="col-6 d-block mx-auto">
                                <div class="text-center">
-                                  <p>Şu wagtlykça bu bölümde haryt ýok</p>
+                                  <p>{{ 'product.SuwagtlykcaHarytYok'|_ }}</p>
                               </div>
                             </div>
                           </div>
@@ -217,20 +311,28 @@
                                         {% 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>
+                                                <a href="#"><i class="icofont-shopping-cart"></i> {{ 'product.SebedeGos'|_ }}</a>
                                             </div>
                                         {% else %}
                                             <div class="product_add_to_cart">
-                                                <a href="{{ 'login'|page }}"><i class="icofont-shopping-cart"></i> Sebede goş</a>
+                                                <a href="{{ 'login'|page }}"><i class="icofont-shopping-cart"></i> {{ 'product.SebedeGos'|_ }}</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>
+                                            <a href="#" data-toggle="modal" data-target="#quickview{{product.id}}"><i class="icofont-eye-alt"></i> {{ 'parallaxDolyMaglumat'|_ }}</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>
+                                        <h6 class="product-price">
+                                            {% if product.vendor.web2 > 0 %}
+                                                <del style="color: rgb(253, 0, 24);">{{ product.price }} TMT</del>
+                                                    {{ product.getDiscountedPrice(product.vendor.web2) }} TMT
+                                                {% else %}
+                                                    {{ product.price }} TMT
+                                            {% endif %}
+                                        </h6>
+                                        <span class="badge mt-2 {{ product.stock == 0 ? 'badge-secondary' : 'badge-success' }}">{{ product.stock == 0 ? 'productAdd.ZakazaGelyar'|_ : 'productAdd.ElimizdeBar'|_ }}</span>
                                     </div>
                                 </div>
                             </div>
@@ -247,7 +349,7 @@
                         <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>
+                                    <li class="page-item"><a class="page-link" href="{{ products.previousPageUrl }}{{params}}">{{ 'paginationOnki'|_ }}</a></li>
                                 {% endif %}
                     
                                 {% for page in range(1, products.lastPage) %}
@@ -261,7 +363,7 @@
                                 {% endfor %}
                     
                                 {% if products.lastPage > products.currentPage %}
-                                    <li class="page-item"><a class="page-link" href="{{ products.nextPageUrl }}{{params}}">Indiki</a></li>
+                                    <li class="page-item"><a class="page-link" href="{{ products.nextPageUrl }}{{params}}">{{ 'paginationIndiki'|_ }}</a></li>
                                 {% endif %}
                             </ul>
                         </nav>
@@ -274,6 +376,28 @@
 
 {% put scripts %}
 <script>
+    function getCategories(catId) {
+        if(catId == ''){
+            return;
+        }
+        $.request('onGetCategorySubs', {
+        data: {'mainCat': catId},
+        success: function(data) {
+                 if(data.length > 0){
+                     $('#subcategory').prop("disabled", false);
+                     $('#subcategory').html(`<option value="">Subkategoriýa saýla</option>`);
+                     for (var sub of data) {
+                         $('#subcategory').append(`<option value="`+sub.slug+`">`+sub.name+`</option>`);
+                     }
+                 }else{
+                     $('#subcategory').prop("disabled", true);
+                 }
+                
+            }
+        });   
+    }
+        
+        
     function sortHandle() {
         event.preventDefault();
         let sort = document.getElementById("sort_input");

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

@@ -4,10 +4,10 @@
     <div class="container h-100">
         <div class="row h-100 align-items-center">
             <div class="col-12">
-                <h5>Habarlaşmak</h5>
+                <h5>{{ 'breadcrumbHabarlasmak'|_ }}</h5>
                 <ol class="breadcrumb">
-                    <li class="breadcrumb-item"><a href="https://gurlushyk.com.tm">Esasy sahypa</a></li>
+                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">{{ 'breadcrumbEsasySahypa'|_ }}</a></li>
-                    <li class="breadcrumb-item active">Habarlaşmak</li>
+                    <li class="breadcrumb-item active">{{ 'breadcrumbHabarlasmak'|_ }}</li>
                 </ol>
             </div>
         </div>
@@ -25,7 +25,7 @@
                         <img src="{{ 'assets/img/logo/gurlushyk-logo2.png'|theme }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi">
                     </div>
                     <div class="chat_wall_text">
-                        Häzirlikçe size ýazylan hat ýok
+                       {{ 'chat.HazirlikceSizeYazylanHatYok'|_ }}
                     </div>
                 </div>
             </div>
@@ -88,8 +88,7 @@
                             <img src="{{ 'assets/img/logo/gurlushyk-logo2.png'|theme }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi">
                         </div>
                         <div class="chat_wall_text">
-                            Выберите один из активных диалоговых окон
+                            {{ 'chat.BiriniSaylan'|_ }}
-                            чтоб начать переписку!
                         </div>
                     </div>
 

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

@@ -4,10 +4,10 @@
     <div class="container h-100">
         <div class="row h-100 align-items-center">
             <div class="col-12">
-                <h5>Teswirlerim</h5>
+                <h5>{{ 'profileDropdown.Kammentarialar'|_ }}</h5>
                 <ol class="breadcrumb">
-                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">Esasy sahypa</a></li>
+                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">{{ 'breadcrumbEsasySahypa'|_ }}</a></li>
-                    <li class="breadcrumb-item active">Teswirler</li>
+                    <li class="breadcrumb-item active">{{ 'profileDropdown.Kammentarialar'|_ }}</li>
                 </ol>
             </div>
         </div>
@@ -29,22 +29,24 @@
                 </div>
                 <div class="col-6 d-block mx-auto">
                    <div class="text-center">
-                      <p>Şu wagtlykça teswir ýok</p>
+                      <p>{{ 'profile.SuwagtlykcaTeswirYok'|_ }}</p>
                   </div>
                 </div>
               </div>
         </div>
     {% else %}
         <div class="row">
-            <div class="col-12">
+            {% partial "user/menu" %}
+        
+            <div class="col-12 col-lg-9">
                 <div class="cart-table wishlist-table">
                     <div class="table-responsive">
                         <table class="table table-bordered mb-30">
                             <thead>
                                 <tr>
-                                    <th scope="col">Surat</th>
+                                    <th scope="col">{{ 'product.Surat'|_ }}</th>
-                                    <th scope="col">Haryt ady</th>
+                                    <th scope="col">{{ 'product.HarytAdy'|_ }}</th>
-                                    <th scope="col">Teswir</th>
+                                    <th scope="col">{{ 'product.Kammentaria'|_ }}</th>
                                     <th scope="col"></th>
                                 </tr>
                             </thead>
@@ -69,7 +71,7 @@
                                             <i class="fa fa-star {{ (comment.rating == 4 or comment.rating > 3) ? 'colorYellow' : '' }}" aria-hidden="true"></i>
                                             <i class="fa fa-star {{ (comment.rating == 5 or comment.rating > 4) ? 'colorYellow' : '' }}" aria-hidden="true"></i>
                                         </td>
-                                        <td><a href="{{ 'product'|page({id: comment.product.id}) }}" class="btn btn-primary btn-sm">Harydy görmek</a></td>
+                                        <td><a href="{{ 'product'|page({id: comment.product.id}) }}" class="btn btn-primary btn-sm">{{ 'product.HarydyGormek'|_ }}</a></td>
                                     </tr>
                                 {% endfor %}
                             </tbody>
@@ -81,7 +83,7 @@
                                 <nav aria-label="Page navigation">
                                     <ul class="pagination pagination-sm justify-content-center">
                                         {% if comments.currentPage > 1 %}
-                                            <li class="page-item"><a class="page-link" href="{{ comments.previousPageUrl }}">Öňki</a></li>
+                                            <li class="page-item"><a class="page-link" href="{{ comments.previousPageUrl }}">{{ 'paginationOnki'|_ }}</a></li>
                                         {% endif %}
 
                                         {% for page in range(1, comments.lastPage) %}
@@ -89,7 +91,7 @@
                                         {% endfor %}
 
                                         {% if comments.lastPage > comments.currentPage %}
-                                            <li class="page-item"><a class="page-link" href="{{ comments.nextPageUrl }}">Indiki</a></li>
+                                            <li class="page-item"><a class="page-link" href="{{ comments.nextPageUrl }}">{{ 'paginationIndiki'|_ }}</a></li>
                                         {% endif %}
                                     </ul>
                                 </nav>

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

@@ -4,10 +4,10 @@
     <div class="container h-100">
         <div class="row h-100 align-items-center">
             <div class="col-12">
-                <h5>Halanlarym</h5>
+                <h5>{{ 'profileDropdown.Halanlarym'|_ }}</h5>
                 <ol class="breadcrumb">
-                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">Esasy sahypa</a></li>
+                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">{{ 'breadcrumbEsasySahypa'|_ }}</a></li>
-                    <li class="breadcrumb-item active">Halanlarym</li>
+                    <li class="breadcrumb-item active">{{ 'profileDropdown.Halanlarym'|_ }}</li>
                 </ol>
             </div>
         </div>
@@ -29,7 +29,7 @@
                 </div>
                 <div class="col-6 d-block mx-auto">
                    <div class="text-center">
-                      <p>Şu wagtlykça haryt ýok</p>
+                      <p>{{ 'product.SuwagtlykcaHarytYok'|_ }}</p>
                   </div>
                 </div>
               </div>
@@ -42,9 +42,9 @@
                         <table class="table table-bordered mb-30">
                             <thead>
                                 <tr>
-                                    <th scope="col">Surat</th>
+                                    <th scope="col">{{ 'product.Surat'|_ }}</th>
-                                    <th scope="col">Haryt ady</th>
+                                    <th scope="col">{{ 'product.HarytAdy'|_ }}</th>
-                                    <th scope="col">Bahasy</th>
+                                    <th scope="col">{{ 'product.Bahasy'|_ }}</th>
                                     <th scope="col"></th>
                                 </tr>
                             </thead>
@@ -64,8 +64,8 @@
                                             {{ favourite.product.price }} TMT
                                         </td>
                                         <td align="center" width="40%">
-                                            <a href="{{ 'product'|page({id: favourite.product.id}) }}" class="btn btn-primary btn-sm">Harydy görmek</a>
+                                            <a href="{{ 'product'|page({id: favourite.product.id}) }}" class="btn btn-primary btn-sm">{{ 'product.HarydyGormek'|_ }}</a>
-                                            <a href="#" data-request="onRemove" data-request-data="product_id: {{ favourite.product.id }}" data-request-flash class="btn btn-primary btn-sm">Halanlarymdan aýyrmak</a>
+                                            <a href="#" data-request="onRemove" data-request-data="product_id: {{ favourite.product.id }}" data-request-flash class="btn btn-primary btn-sm">{{ 'favourites.HalanlarymdanAyyrmak'|_ }}</a>
                                         </td>
                                     </tr>
                                 {% endfor %}
@@ -78,7 +78,7 @@
                                 <nav aria-label="Page navigation">
                                     <ul class="pagination pagination-sm justify-content-center">
                                         {% if favourites.currentPage > 1 %}
-                                            <li class="page-item"><a class="page-link" href="{{ favourites.previousPageUrl }}">Öňki</a></li>
+                                            <li class="page-item"><a class="page-link" href="{{ favourites.previousPageUrl }}">{{ 'paginationOnki'|_ }}</a></li>
                                         {% endif %}
 
                                         {% for page in range(1, favourites.lastPage) %}
@@ -86,7 +86,7 @@
                                         {% endfor %}
 
                                         {% if favourites.lastPage > favourites.currentPage %}
-                                            <li class="page-item"><a class="page-link" href="{{ favourites.nextPageUrl }}">Indiki</a></li>
+                                            <li class="page-item"><a class="page-link" href="{{ favourites.nextPageUrl }}">{{ 'paginationIndiki'|_ }}</a></li>
                                         {% endif %}
                                     </ul>
                                 </nav>

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

@@ -4,10 +4,10 @@
     <div class="container h-100">
         <div class="row h-100 align-items-center">
             <div class="col-12">
-                <h5>Harytlarym</h5>
+                <h5>{{ 'profileDropdown.Harytlarym'|_ }}</h5>
                 <ol class="breadcrumb">
-                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">Esasy sahypa</a></li>
+                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">{{ 'breadcrumbEsasySahypa'|_ }}</a></li>
-                    <li class="breadcrumb-item active">Harytlarym</li>
+                    <li class="breadcrumb-item active">{{ 'profileDropdown.Harytlarym'|_ }}</li>
                 </ol>
             </div>
         </div>
@@ -29,27 +29,30 @@
                 </div>
                 <div class="col-6 d-block mx-auto">
                    <div class="text-center">
-                      <p>Şu wagtlykça haryt ýok</p>
+                      <p>{{ 'product.SuwagtlykcaHarytYok'|_ }}</p>
                   </div>
                 </div>
               </div>
         </div>
-    {% else %}
+   {% else %}
         <div class="row">
-            <div class="col-12">
+            {% partial "user/menu" %}
+        
+            <div class="col-12 col-lg-9">
                 <div class="cart-table wishlist-table">
                     <div class="table-responsive">
                         <table class="table table-bordered mb-30">
                             <thead>
                                 <tr>
-                                    <th scope="col">Surat</th>
+                                    <th scope="col">{{ 'product.Surat'|_ }}</th>
-                                    <th scope="col">Haryt ady</th>
+                                    <th scope="col">{{ 'product.HarytAdy'|_ }}</th>
-                                    <th scope="col">Bahasy</th>
+                                    <th scope="col">{{ 'product.Bahasy'|_ }}</th>
+                                    <th scope="col">{{ 'checkout.Status'|_ }}</th>
                                     <th scope="col"></th>
                                 </tr>
                             </thead>
                             <tbody>
-
+    
                                 {% for product in products %}
                                     <tr>
                                         <td>
@@ -59,13 +62,22 @@
                                             <a href="{{ 'product'|page({id: product.id}) }}">{{ product.name }}</a>
                                         </td>
                                         <td>{{ product.price }} TMT</td>
+                                        <td>
+                                            {% if product.status == 'new' %}
+                                                <span class="badge badge-warning">{{ 'awaiting'|_ }}</span>
+                                                
+                                            {% else %}
+                                                <span class="badge badge-success">{{ 'confirmed'|_ }}</span>
+                                                
+                                            {% endif %}
+                                        </td>
                                         <td align="center" width="25%">
                                         <button 
                                             data-request="onDeleteOffer"
                                             data-request-data="id: {{product.id}}"
                                             data-request-flash
-                                            class="btn btn-primary btn-sm">Pozmak</button>
+                                            class="btn btn-primary btn-sm mb-1">{{ 'product.Pozmak'|_ }}</button>
-                                            <a href="{{ 'addProduct'|page({productId: product.id}) }}" class="btn btn-primary btn-sm">Üýtgetmek</a>
+                                            <a href="{{ 'addProduct'|page({productId: product.id}) }}" class="btn btn-primary btn-sm">{{ 'product.Uytgetmek'|_ }}</a>
                                         </td>
                                     </tr>
                                 {% endfor %}
@@ -73,9 +85,39 @@
                         </table>
                     </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}}">{{ 'paginationOnki'|_ }}</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}}">{{ 'paginationIndiki'|_ }}</a></li>
+                                {% endif %}
+                            </ul>
+                        </nav>
+                    </div>
+                {% endif %}
+                
+                
+                
             </div>
         </div>
-    {% endif %}
+   {% endif %}
     
     
         

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

@@ -4,10 +4,10 @@
     <div class="container h-100">
         <div class="row h-100 align-items-center">
             <div class="col-12">
-                <h5>Harytlarym</h5>
+                <h5>{{ 'profileDropdown.Zakazlarym'|_ }}</h5>
                 <ol class="breadcrumb">
-                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">Esasy sahypa</a></li>
+                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">{{ 'breadcrumbEsasySahypa'|_ }}</a></li>
-                    <li class="breadcrumb-item active">Zakazlarym</li>
+                    <li class="breadcrumb-item active">{{ 'profileDropdown.Zakazlarym'|_ }}</li>
                 </ol>
             </div>
         </div>
@@ -29,22 +29,24 @@
                 </div>
                 <div class="col-6 d-block mx-auto">
                    <div class="text-center">
-                      <p>Şu wagtlykça zakaz ýok</p>
+                      <p>{{ 'profile.SuwagtlykcaZakazYok'|_ }}</p>
                   </div>
                 </div>
               </div>
         </div>
     {% else %}
         <div class="row">
-            <div class="col-12">
+        {% partial "user/menu" %}
+        
+            <div class="col-12 col-lg-9">
                 <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">{{ 'zakaz.TertipBelgisi'|_ }}</th>
-                                    <th scope="col">Wagty</th>
+                                    <th scope="col">{{ 'zakaz.Wagty'|_ }}</th>
-                                    <th scope="col">Status</th>
+                                    <th scope="col">{{ 'zakaz.Status'|_ }}</th>
                                     <th scope="col"></th>
                                 </tr>
                             </thead>
@@ -54,9 +56,15 @@
                                     <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>
+                                            {% if order.status == 'new' %}
+                                                <span class="badge badge-info">{{ 'order.TazeSargyt'|_ }}</span>
+                                            {% else %}
+                                                <span class="badge badge-success">{{ 'order.KabulEdildi'|_ }}</span>
+                                            {% endif %}
+                                        </td>
                                         <td align="center" width="25%">
-                                            <a href="{{ 'order-detail'|page({id: order.id}) }}" class="btn btn-primary btn-sm">Sargydy görmek</a>
+                                            <a href="{{ 'order-detail'|page({id: order.id}) }}" class="btn btn-primary btn-sm">{{ 'order.SargydyGormek'|_ }}</a>
                                         </td>
                                     </tr>
                                 {% endfor %}

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

@@ -12,13 +12,14 @@
     <div class="container h-100">
         <div class="row h-100 align-items-center">
             <div class="col-12">
-                <h5>Haryt goşmak üýtgetmek</h5>
+                <h5>{{ 'product.HarytGosmak'|_ }}</h5>
                 <ol class="breadcrumb">
                     <li class="breadcrumb-item"><a href="{{ 'index'|page }}">Esasy sahypa</a></li>
+                    <li class="breadcrumb-item"><a href="{{ 'my-offers'|page }}">{{ 'breadcrumbYza'|_ }}</a></li>
                     {% if productForEditing %}
-                        <li class="breadcrumb-item active">Haryt üýtgetmek</li>
+                        <li class="breadcrumb-item active">{{ 'product.HarytUytgetmek'|_ }}</li>
                     {% else %}
-                        <li class="breadcrumb-item active">Haryt goşmak</li>
+                        <li class="breadcrumb-item active">{{ 'product.HarytGosmak'|_ }}</li>
                     {% endif %}
                 </ol>
             </div>
@@ -28,7 +29,7 @@
 <!-- Breadcumb Area -->
 
 <!-- addProducts Area -->
-<div class="bigshop_reg_log_area section_padding_100_50">
+<div class="bigshop_reg_log_area section_padding_100_50" id="mainDiv">
     <div class="container">
         <div class="row">
             <div class="col-12 col-md-12">
@@ -147,31 +148,19 @@
                                         <label for="subcategory">Ikinji kategoriýa</label>
                                         <!-- {{ productForEditing.categories }} -->
                                         <select class="custom-select d-block w-100 form-control" id="subcategoryEdit" name="subcategory_id" required>
-                                            
                                             {% for prodCat in productForEditing.categories %}
                                                 {% if prodCat.primary_key == 0 %}
                                                     <option value=null disabled>Birinji dereje Sub-kategoriýa saýla</option>
                                                 {% else %}
                                                     {% if prodCat.subs.count > 0 %}
-                                                    <option value="{{ prodCat.id }}" {{ productForEditing.categories.contains(prodCat.id) ? 'selected' : '' }} data-file="{{ prodCat.is_file_category }}">2nji dereje {{ prodCat.name }}</option>
+                                                    <option value="{{ prodCat.id }}" {{ productForEditing.categories.contains(prodCat.id) ? 'selected' : '' }} data-file="{{ prodCat.is_file_category }}">{{ prodCat.name }}</option>
                                                         {% for sub in prodCat.subs %}
-                                                            <option value="{{ sub.id }}" {{ productForEditing.categories.contains(sub.id) ? 'selected' : '' }} data-file="{{ sub.is_file_category }}">3nji dereje --{{ sub.name }}</option>
+                                                            <option value="{{ sub.id }}" {{ productForEditing.categories.contains(sub.id) ? 'selected' : '' }} data-file="{{ sub.is_file_category }}">{{ sub.name }}</option>
                                                         {% endfor %}
                                                     {% else %}
                                                         <option></option>
                                                     {% endif %}
-                                                {% endif %}
+                                                {% endif %}                                   
-                                                
-                                                
-                                                
-                                                
-<!--                                                 {% if prodCat.parent %}
-    <option value="{{ prodCat.parent.id }}" {{ productForEditing.categories.contains(prodCat.parent.id) ? 'selected' : '' }} data-file="{{ prodCat.parent.is_file_category }}">{{ prodCat.parent.name }}</option>
-{% endif %}
-
-
- -->
-                                                
                                             {% endfor %}
                                         </select>
                                     </div>

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

@@ -0,0 +1,14 @@
+<div class="container mb-5">
+    <div class="row d-block justify-content-center align-items-center">
+        <div class="col-6 d-block mx-auto">
+           <div class="text-center">
+              <img src="{{ 'assets/img/core-img/productAddSuccess.png'|theme }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi">
+          </div>
+        </div>
+        <div class="col-6 d-block mx-auto">
+            <div class="text-center">
+              <h2>{{ 'product.UstunlikliUytgedildi'|_ }}</h2>
+          </div>
+        </div>
+      </div>
+</div>

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

@@ -1,198 +0,0 @@
-<div class="contact_title">
-    {{'account.add_post'|_({ step_number: 2 })}}
-</div>
-
-<form action="#" class="post_form" enctype="multipart/form-data"
-    data-request="onOfferFill"
-    data-request-validate
-    data-request-flash
-    data-request-files
->
-    <input type="hidden" name="product_id" value="{{product.id}}">
-
-    <div class="post_input p-b">
-        <label>{{'page.measure'|_}} <span>*</span> </label>
-        <div class="my-select">
-            <select name="measure_id">
-                <option value="">{{'page.measure'|_}}</option>
-                {% for m in measures %}
-                <option value="{{m.id}}"
-                    {% if product.measure.id == m.id %}
-                        selected
-                    {% endif %}
-                >{{m.name}}</option>
-                {% endfor %}
-            </select>
-            <span class="error_txt" data-validate-for="measure_id"></span>
-        </div>
-    </div>
-
-    <div class="post_input">
-        <label for="good-count">{{'page.prod_amount_2'|_}} <span>*</span> </label>
-        <input type="number" step="0.01" name="quantity" placeholder="{{'page.example'|_}}: {{'account.quantity_example'|_}}" id="good-count"
-        value="{{ product.quantity }}">
-        <span class="error_txt" data-validate-for="quantity"></span>
-    </div>
-
-    <div class="post_input p-b">
-        <label>{{'account.currency'|_}}  <span>*</span> </label>
-        <div class="my-select">
-            <select name="currency_id">
-                <option value="">{{'account.currency'|_}}</option>
-                {% for currency in currencies %}
-                <option value="{{currency.id}}"
-                    {% if product.currency.id == currency.id %}
-                        selected
-                    {% endif %}
-                >{{currency.name}}</option>
-                {% endfor %}
-            </select>
-            <span class="error_txt" data-validate-for="currency_id"></span>
-        </div>
-    </div>
-
-    <div class="post_input">
-        <label for="good-cost">{{'page.prod_price'|_}} <span>*</span> </label>
-        <input type="text" name="price" placeholder="{{'page.example'|_}}: 120" id="good-cost"
-        value="{{ product.price }}">
-        <span class="error_txt" data-validate-for="price"></span>
-    </div>
-
-    <div class="post_input p-b">
-        <label>{{'page.delivery_cond'|_}} <span>*</span> </label>
-        <div class="my-select">
-            <select name="delivery_term_id">
-                <option value="">{{'page.delivery_cond'|_}}</option>
-                {% for dt in deliveryTerms %}
-                <option value="{{dt.id}}"
-                    {% if product.delivery_term.id == dt.id %}
-                        selected
-                    {% endif %}
-                >{{dt.name}}</option>
-                {% endfor %}
-            </select>
-            <span class="error_txt" data-validate-for="delivery_term_id"></span>
-        </div>
-    </div>
-
-    <div class="post_input">
-        <label for="good-cost">{{'page.delivery_point'|_}} <span>*</span> </label>
-        <input type="text" name="place" placeholder="{{'page.example'|_}}: {{'account.delivery_point_example'|_}}" id="good-cost"
-        value="{{ product.place }}">
-        <span class="error_txt" data-validate-for="place"></span>
-    </div>
-
-    <div class="post_input p-b">
-        <label>{{'page.packaging'|_}} <span>*</span></label>
-        <div class="my-select">
-            <select name="packaging">
-                <option value="">{{'page.packaging'|_}}</option>
-                <option value="yes"
-                    {% if product.packaging == "yes" %}
-                        selected
-                    {% endif %}
-                >{{'page.packaging_yes'|_}}</option>
-                <option value="no"
-                    {% if product.packaging == "no" %}
-                        selected
-                    {% endif %}
-                >{{'page.packaging_no'|_}}</option>
-            </select>
-            <span class="error_txt" data-validate-for="packaging"></span>
-        </div>
-    </div>
-
-    <div class="post_input p-b">
-        <label>{{'page.payment_cond'|_}}  <span>*</span></label>
-        <div class="my-select">
-            <select name="payment_term_id">
-                <option value="">{{'page.payment_cond'|_}}</option>
-                {% for pt in paymentTerms %}
-                <option value="{{pt.id}}"
-                    {% if product.payment_term.id == pt.id %}
-                        selected
-                    {% endif %}
-                >{{pt.name}}</option>
-                {% endfor %}
-            </select>
-            <span class="error_txt" data-validate-for="payment_term_id"></span>
-        </div>
-    </div>
-
-    <div class="post_comment">
-        <label for="description_ru">{{'page.prod_desc'|_}} (RU) <span>*</span></label>
-        <textarea id="description_ru" name="description_ru">{{product.lang('ru').description}}</textarea>
-        <span class="error_txt" data-validate-for="description_ru"></span>
-    </div>
-    <div class="post_comment">
-        <label for="description_en">{{'page.prod_desc'|_}} (EN) <span>*</span></label>
-        <textarea id="description_en" name="description_en">{{product.lang('en').description}}</textarea>
-        <span class="error_txt" data-validate-for="description_en"></span>
-    </div>
-    <div class="post_comment">
-        <label for="description_tm">{{'page.prod_desc'|_}} (TM) <span>*</span></label>
-        <textarea id="description_tm" name="description_tm">{{product.lang('tm').description}}</textarea>
-        <span class="error_txt" data-validate-for="description_tm"></span>
-    </div>
-
-    <div class="post_upload_box">
-
-        {% for i in 0..2 %}
-        <div class="post_upload_item">
-            {% if product.images[i] %}
-            <div class="post_upload_img">
-                <img src="{{ product.images[i].thumb(347,150,{'mode':'crop'}) }}" alt="photo">
-                <input type="hidden" name="old_img[{{i}}]">
-            </div>
-            {% endif %}
-
-            <div class="post_input">
-                {% if not product.images[i] %}
-                <label>{{'account.upload_photo'|_}} #{{i+1}} <span>*</span></label>
-                <div class="upload_group">
-                    <label for="file-{{i}}">{{'account.upload_photo'|_}}</label>
-                    <div class="form_group">
-                        <label class="additional">
-                            <span>{{'account.nothing_chosen'|_}}</span>
-                        </label>
-                        <input type="file"
-                            name="new_img[{{i}}]"
-                            id="file-{{i}}" class="inputfile inputfile-1"
-                            data-multiple-caption="{count} files selected"
-                        />
-                    </div>
-                </div>
-                {% else %}
-                <a href="#"
-                    data-request="onImageDelete"
-                    data-request-data="being_edited_product_id: {{product.id}}, product_image_id: {{product.images[i].id}}"
-                    class="select_delete delete-btn">
-                    <img src="{{'assets/images/svg/red-close.svg'|theme}}" alt="">
-                </a>
-                {% endif %}
-            </div>
-        </div>
-        {% endfor %}
-    </div>
-
-    <span class="error_txt t-c" data-validate-for="no_images"></span>
-    <span class="error_txt t-c" data-validate-for="new_img_size_error"></span>
-    <span class="error_txt t-c" data-validate-for="new_img_type_error"></span>
-
-    <div class="btn_bg">
-        <button class="post_btn" type="submit">
-            {{'account.step'|_({ step_number: 3 })}}
-        </button>
-    </div>
-
-    <div class="add_post_text">
-        {{'account.required_fields'|_}}
-    </div>
-
-</form>
-
-
-
-<script src="{{ 'assets/js/custom-file-input.js'|theme }}"></script>
-<script src="{{ 'assets/js/scrollTopOnSteps.js'|theme }}"></script>
-

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

@@ -0,0 +1,17 @@
+<div class="container mb-5">
+    <div class="row d-block justify-content-center align-items-center">
+        <div class="col-6 d-block mx-auto">
+           <div class="text-center">
+              <img src="{{ 'assets/img/core-img/productAddSuccess.png'|theme }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi">
+          </div>
+        </div>
+        <div class="col-6 d-block mx-auto">
+            <div class="text-center">
+              <h3>{{ 'product.UstunlikliGosuldy'|_ }}</h3>
+          </div>
+           <div class="text-center mt-2">
+              <p>{{ 'product.BosSmsUgratmak'|_ }}</p>
+          </div>
+        </div>
+      </div>
+</div>

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

@@ -1,241 +0,0 @@
-<div class="contact_title">
-    {{'account.add_post'|_({ step_number: 3 })}}
-</div>
-
-{% flash error %}
-<p data-control="flash-message" data-interval="5" class="error">
-    {{ message }}
-</p>
-{% endflash %}
-
-<div class="add_post-3">
-    <div class="add_post-box">
-        <div class="add_post_box-item">
-            <div class="add_post_box-item-row">
-                <h4 class="add_post-box-title">
-                    {{'account.lot_title'|_}} (RU)
-                </h4>
-            </div>
-            <div class="add_post_box-item-row">
-                <p class="add_post-box-text">
-                    {{ product.lang('ru').name }}
-                </p>
-            </div>
-        </div>
-        <div class="add_post_box-item">
-            <div class="add_post_box-item-row">
-                <h4 class="add_post-box-title">
-                    {{'account.lot_title'|_}} (EN)
-                </h4>
-            </div>
-            <div class="add_post_box-item-row">
-                <p class="add_post-box-text">
-                    {{ product.lang('en').name }}
-                </p>
-            </div>
-        </div>
-        <div class="add_post_box-item">
-            <div class="add_post_box-item-row">
-                <h4 class="add_post-box-title">
-                    {{'account.lot_title'|_}} (TM)
-                </h4>
-            </div>
-            <div class="add_post_box-item-row">
-                <p class="add_post-box-text">
-                    {{ product.lang('tm').name }}
-                </p>
-            </div>
-        </div>
-        <div class="add_post_box-item">
-            <div class="add_post_box-item-row">
-                <h4 class="add_post-box-title">
-                    {{'page.prod_mark'|_}}
-                </h4>
-            </div>
-            <div class="add_post_box-item-row">
-                <p class="add_post-box-text">
-                    {{ product.mark }}
-                </p>
-            </div>
-        </div>
-        <div class="add_post_box-item">
-            <div class="add_post_box-item-row">
-                <h4 class="add_post-box-title">
-                    {{'page.prod_vendor'|_}}
-                </h4>
-            </div>
-            <div class="add_post_box-item-row">
-                <p class="add_post-box-text">
-                    {{ product.manufacturer }}
-                </p>
-            </div>
-        </div>
-        <div class="add_post_box-item">
-            <div class="add_post_box-item-row">
-                <h4 class="add_post-box-title">
-                    {{'account.category'|_}}
-                </h4>
-            </div>
-            <div class="add_post_box-item-row">
-                <p class="add_post-box-text">
-                    {{ product.categories.first.name }}
-                </p>
-            </div>
-        </div>
-        <div class="add_post_box-item">
-            <div class="add_post_box-item-row">
-                <h4 class="add_post-box-title">
-                    {{'page.prod_vendor_country'|_}}
-                </h4>
-            </div>
-            <div class="add_post_box-item-row">
-                <p class="add_post-box-text">
-                    {{ product.country }}
-                </p>
-            </div>
-        </div>
-        <div class="add_post_box-item">
-            <div class="add_post_box-item-row">
-                <h4 class="add_post-box-title">
-                    {{'page.market_type'|_}}
-                </h4>
-            </div>
-            <div class="add_post_box-item-row">
-                <p class="add_post-box-text">
-                    {% if product and product.market_type == 'in' %}
-                        {{'page.market_type_option_in'|_}}
-                    {% endif %}
-                    {% if product and product.market_type == 'out' %}
-                        {{'page.market_type_option_out'|_}}
-                    {% endif %}
-                </p>
-            </div>
-        </div>
-        <div class="add_post_box-item">
-            <div class="add_post_box-item-row">
-                <h4 class="add_post-box-title">
-                    {{'page.measure'|_}}
-                </h4>
-            </div>
-            <div class="add_post_box-item-row">
-                <p class="add_post-box-text">
-                    {{ product.measure.name }}
-                </p>
-            </div>
-        </div>
-        <div class="add_post_box-item">
-            <div class="add_post_box-item-row">
-                <h4 class="add_post-box-title">
-                    {{'page.prod_amount_2'|_}}
-                </h4>
-            </div>
-            <div class="add_post_box-item-row">
-                <p class="add_post-box-text">
-                    {{ product.quantity }}
-                </p>
-            </div>
-        </div>
-        <div class="add_post_box-item">
-            <div class="add_post_box-item-row">
-                <h4 class="add_post-box-title">
-                    {{'account.currency'|_}}
-                </h4>
-            </div>
-            <div class="add_post_box-item-row">
-                <p class="add_post-box-text">
-                    {{ product.currency.name }}
-                </p>
-            </div>
-        </div>
-        <div class="add_post_box-item">
-            <div class="add_post_box-item-row">
-                <h4 class="add_post-box-title">
-                    {{'page.prod_price'|_}}
-                </h4>
-            </div>
-            <div class="add_post_box-item-row">
-                <p class="add_post-box-text">
-                    {{ product.price }}
-                </p>
-            </div>
-        </div>
-        <div class="add_post_box-item">
-            <div class="add_post_box-item-row">
-                <h4 class="add_post-box-title">
-                    {{'page.delivery_cond'|_}}
-                </h4>
-            </div>
-            <div class="add_post_box-item-row">
-                <p class="add_post-box-text">
-                    {{ product.delivery_term.name }}
-                </p>
-            </div>
-        </div>
-        <div class="add_post_box-item">
-            <div class="add_post_box-item-row">
-                <h4 class="add_post-box-title">
-                    {{'page.delivery_point'|_}}
-                </h4>
-            </div>
-            <div class="add_post_box-item-row">
-                <p class="add_post-box-text">
-                    {{ product.place }}
-                </p>
-            </div>
-        </div>
-        <div class="add_post_box-item">
-            <div class="add_post_box-item-row">
-                <h4 class="add_post-box-title">
-                    {{'page.packaging'|_}}
-                </h4>
-            </div>
-            <div class="add_post_box-item-row">
-                <p class="add_post-box-text">
-                    {% if product.packaging == "yes" %}
-                        {{'page.packaging_yes'|_}}
-                    {% endif %}
-                    {% if product.packaging == "no" %}
-                        {{'page.packaging_no'|_}}
-                    {% endif %}
-                </p>
-            </div>
-        </div>
-        <div class="add_post_box-item">
-            <div class="add_post_box-item-row">
-                <h4 class="add_post-box-title">
-                    {{'page.payment_cond'|_}}
-                </h4>
-            </div>
-            <div class="add_post_box-item-row">
-                <p class="add_post-box-text">
-                    {{ product.payment_term.name }}
-                </p>
-            </div>
-        </div>
-    </div>
-    <form data-request="onPublish" data-request-validate class="basket_info">
-        
-        <input type="hidden" name="product_id" value="{{product.id}}">
-
-        <div class="basket_info_title">
-            Стоимость
-        </div>
-        <div class="basket_info_item">
-            <div class="basket_info_box">
-                <div class="basket_info_name">
-                    Цена за пост:
-                </div>
-                <div class="basket_info_cash">
-                    {{ fee }} TMT
-                </div>
-            </div>
-            <button class="pay_link" type="submit">
-                {{'account.publish'|_}}
-            </button>
-        </div>
-    </form>
-</div>
-
-
-<script src="{{ 'assets/js/custom-file-input.js'|theme }}"></script>
-<script src="{{ 'assets/js/scrollTopOnSteps.js'|theme }}"></script>

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

@@ -4,6 +4,7 @@
 {% set cities = __SELF__.cities %}
 
 
+
 {% for product in products %}
 <!-- Quick View Modal Area -->
 <div class="modal fade" id="quickview{{product.id}}" tabindex="-1" role="dialog" aria-labelledby="quickview" aria-hidden="true">
@@ -34,9 +35,16 @@
                                         <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>
+                                    <h5 class="price">
+                                        {% if product.vendor.web2 > 0 %}
+                                            <del style="color: rgb(253, 0, 24);">{{ product.price }} TMT</del>
+                                                {{ product.getDiscountedPrice(product.vendor.web2) }} TMT
+                                            {% else %}
+                                                {{ product.price }} TMT
+                                        {% endif %}
+                                    </h5> <span class="badge ml-2 {{ product.stock == 0 ? 'badge-secondary' : 'badge-success' }}">{{ product.stock == 0 ? 'productAdd.ZakazaGelyar'|_ : 'productAdd.ElimizdeBar'|_ }}</span>
                                     <p>{{ html_limit(product.description, 100) }}</p>
-                                    <a href="{{ 'product'|page({id: product.id}) }}">Giňişleýin maglumat</a>
+                                    <a href="{{ 'product'|page({id: product.id}) }}">{{ 'modal.GinisleyinMaglumat'|_ }}</a>
                                 </div>
                                 <!-- Add to Cart Form -->
                                 <form class="cart" method="post">
@@ -45,11 +53,11 @@
                                     </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>
+                                            <a href="#" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">{{ 'product.SebedeGos'|_ }}</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>
+                                                <a href="{{ 'login'|page }}" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">{{ 'product.SebedeGos'|_ }}</a>
                                          </div>
                                     {% endif %}
                                     <!-- Wishlist -->
@@ -86,9 +94,10 @@
     <div class="container h-100">
         <div class="row h-100 align-items-center">
             <div class="col-12">
-                <h5>Harytlar</h5>
+                <h5>{{ 'breadcrumbHarytlar'|_ }}</h5>
                 <ol class="breadcrumb">
-                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">Esasy sahypa</a></li>
+                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">{{ 'breadcrumbEsasySahypa'|_ }}</a></li>
+                    
                     {% if category.parent.parent %}
                         <li class="breadcrumb-item">
                             <a href="{{ 'category-profile'|page({categorySlug: category.parent.parent.slug}) }}">{{ category.parent.parent.name }}</a>
@@ -107,6 +116,87 @@
 </div>
 <!-- Breadcumb Area -->
 
+
+<!-- Shop Catagory Area -->
+<div class="shop_by_catagory_area section_padding_0">
+    <div class="container">
+        <div class="row">
+            <div class="col-12">
+                <div class="shop_by_catagory_slides owl-carousel">
+                    <!-- Single Slide -->
+                    
+                    {% if category.primary_key > 0 %}
+                    
+                        {% if category.parent.primary_key > 0 %}
+                            <div class="single_catagory_slide">
+                                <a href="{{ 'category-profile'|page({categorySlug: category.parent.parent.slug}) }}">
+                                    <img src="{{ 'assets/img/core-img/hemmesi2.png'|theme|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ subcategory.name }}">
+                                </a>
+                                <p>{{ 'product.Hemmesi'|_ }}</p>
+                            </div>
+                        {% else %}
+                            <div class="single_catagory_slide">
+                                <a href="{{ 'category-profile'|page({categorySlug: category.parent.slug}) }}">
+                                    <img src="{{ 'assets/img/core-img/hemmesi2.png'|theme|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ subcategory.name }}">
+                                </a>
+                                <p>{{ 'product.Hemmesi'|_ }}</p>
+                            </div>
+                        {% endif %}
+                        
+                    {% elseif category.parent.parent %}
+                        <div class="single_catagory_slide">
+                            <a href="{{ 'category-profile'|page({categorySlug: category.parent.parent.slug}) }}">
+                                <img src="{{ 'assets/img/core-img/hemmesi2.png'|theme|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ subcategory.name }}">
+                            </a>
+                            <p>{{ 'product.Hemmesi'|_ }}</p>
+                        </div>
+                    {% else %}
+                        <div class="single_catagory_slide">
+                            <a href="{{ 'category-profile'|page({categorySlug: category.slug}) }}">
+                                <img src="{{ 'assets/img/core-img/hemmesi2.png'|theme|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ subcategory.name }}">
+                            </a>
+                            <p>{{ 'product.Hemmesi'|_ }}</p>
+                        </div>
+                    {% endif %}
+                    <!-- 
+                    
+                    
+                    <div class="single_catagory_slide">
+                        <a href="{{ 'category-profile'|page({categorySlug: category.slug}) }}">
+                            <img src="{{ 'assets/img/core-img/hemmesi2.png'|theme|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ subcategory.name }}">
+                        </a>
+                        <p>{{ 'product.Hemmesi'|_ }}</p>
+                    </div> -->
+                    {% set parentCategory = category.parent %}
+                    
+                    {% for subcategory in parentCategory.subs %}
+                            {% if subcategory.subs.count > 0 %}
+                                <div class="single_catagory_slide">
+                                    <a href="{{ 'category-profile'|page({categorySlug: subcategory.slug}) }}">
+                                        <img src="{{ subcategory.icon|media|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ subcategory.name }}">
+                                    </a>
+                                    <p>{{ subcategory.name }}</p>
+                                </div>
+                            {% else %}
+                                <div class="single_catagory_slide">
+                                    <a href="{{ 'category-products'|page({categorySlug: subcategory.slug}) }}">
+                                        <img src="{{ subcategory.icon|media|resize(127, 127, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ subcategory.name }}">
+                                    </a>
+                                    <p>{{ subcategory.name }}</p>
+                                </div>
+                            {% endif %}
+                    {% endfor %}
+                    
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- Shop Catagory Area -->
+
+
+
+
 <section class="shop_grid_area section_padding_100">
     <div class="container">
     
@@ -120,7 +210,7 @@
                 </div>
                 <div class="col-6 d-block mx-auto">
                    <div class="text-center">
-                      <p>Şu wagtlykça haryt ýok</p>
+                      <p>{{ 'product.SuwagtlykcaHarytYok'|_ }}</p>
                   </div>
                 </div>
               </div>
@@ -129,26 +219,39 @@
         <div class="row">
             <div class="col-12 col-md-4 col-lg-3">
                 <div class="shop_sidebar_area">
-                    <form action="{{ 'filter-products'|page }}" method="GET">
+                    <form action="{{ 'filter-products'|page }}" id="filter_form" method="GET">
-                        {% if category.subs|length > 0 %}
+                    
+                     <div class="widget catagory mb-30">
+                        <h6 class="widget-title">{{ 'filter.Kategoriyalar'|_ }}</h6>
+                        <div class="widget-desc">
+                            <select name="category" class="form-control" id="category" onChange="getCategories(this.value);">
+                            <option value="">{{ 'filter.KategoriyaSayla'|_ }}</option>
+                                {% for mainCat in categories %}
+                                    <option value="{{ mainCat.slug }}" {{ mainCat.id == category.id ? 'selected' : ''  }}>{{ mainCat.name }} </option>
+                                {% endfor %}
+                            </select>
+                        </div>
+                    </div>
+                    
+                        
                         <div class="widget catagory mb-30">
-                            <h6 class="widget-title">Sub kategoriýalar</h6>
+                            <h6 class="widget-title">{{ 'productAdd.IkinjiKategoriya'|_ }}</h6>
                             <div class="widget-desc">
                                 <select name="subcategory" class="form-control">
-                                    <option value="">Kategoriýa saýla</option>
+                                    <option value="">{{ 'productAdd.Subkategoriya'|_ }}}</option>
-                                    {% for item in category.subs %}
+                                    {% for item in parentCategory.subs %}
                                         <option value="{{ item.slug }}" {{ item.id == category.id ? 'selected' : ''  }}>{{ item.name }} </option>
                                     {% endfor %}
                                 </select>
                             </div>
                         </div>
-                        {% endif %}
+                        
 
                          <div class="widget brands mb-30">
-                            <h6 class="widget-title">Şäherler</h6>
+                            <h6 class="widget-title">{{ 'filter.Saherler'|_ }}</h6>
                             <div class="widget-desc">
                             <select name="city" class="form-control">
-                                <option value="">Şäher saýla</option>
+                                <option value="">{{ 'filter.SaherSayla'|_ }}</option>
                                 {% for city in cities %}
                                     <option value="{{ city.id }}">{{ city.name }} </option>
                                 {% endfor %}
@@ -158,7 +261,7 @@
 
                         <!-- Single Widget -->
                         <div class="widget price mb-30">
-                            <h6 class="widget-title">Baha</h6>
+                            <h6 class="widget-title">{{ 'filter.Baha'|_ }}</h6>
                             <div class="row">
                                 <div class="col-6">
                                     <input class="form-control" type="number" name="min_price"
@@ -170,7 +273,7 @@
                                 </div>
                             </div>
                         </div>
-                       <button type="submit" class="btn btn-primary" style="width: 100%"> Filterle </button>
+                       <button type="submit" class="btn btn-primary" style="width: 100%"> {{ 'filter.Filterlemek'|_ }} </button>
                  
 
                 </div>
@@ -183,12 +286,12 @@
                         <div class="col-8">
                         </div>
                         <div class="col-4">
-                            <select class="form-control" id="sort" name="sort">
+                            <select class="form-control" onchange="sortHandle()" id="sort_input">
-                                <option value="">Saýla</option>
+                                <option value="">{{ 'sortSaylanmadyk'|_ }}</option>
-                                <option value="price">Arzandan gymmada</option>
+                                <option value="price">{{ 'sortArzandanGymmada'|_ }}</option>
-                                <option value="-price">Gymmatdan arzana</option>
+                                <option value="-price">{{ 'sortGymmatdanArzana'|_ }}</option>
-                                <option value="created_at">Täzeden könä</option>
+                                <option value="created_at">{{ 'sortTazedenKona'|_ }}</option>
-                                <option value="-created_at">Köneden täzä</option>
+                                <option value="-created_at">{{ 'sortKonedenTaza'|_ }}</option>
                             </select>
                         </div>
                     </div>
@@ -237,20 +340,28 @@
                                     {% 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>
+                                            <a href="#"><i class="icofont-shopping-cart"></i> {{ 'product.SebedeGos'|_ }}</a>
                                         </div>
                                     {% else %}
                                         <div class="product_add_to_cart">
-                                            <a href="{{ 'login'|page }}"><i class="icofont-shopping-cart"></i> Sebede goş</a>
+                                            <a href="{{ 'login'|page }}"><i class="icofont-shopping-cart"></i> {{ 'product.SebedeGos'|_ }}</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>
+                                        <a href="#" data-toggle="modal" data-target="#quickview{{product.id}}"><i class="icofont-eye-alt"></i> {{ 'parallaxDolyMaglumat'|_ }}</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>
+                                    <h6 class="product-price">
+                                        {% if product.vendor.web2 > 0 %}
+                                            <del style="color: rgb(253, 0, 24);">{{ product.price }} TMT</del>
+                                                {{ product.getDiscountedPrice(product.vendor.web2) }} TMT
+                                            {% else %}
+                                                {{ product.price }} TMT
+                                        {% endif %}
+                                    </h6>
+                                    <span class="badge mt-2 {{ product.stock == 0 ? 'badge-secondary' : 'badge-success' }}">{{ product.stock == 0 ? 'productAdd.ZakazaGelyar'|_ : 'productAdd.ElimizdeBar'|_ }}</span>
                                 </div>
                             </div>
                         </div>
@@ -263,7 +374,7 @@
                         <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>
+                                    <li class="page-item"><a class="page-link" href="{{ products.previousPageUrl }}{{params}}">{{ 'paginationOnki'|_ }}</a></li>
                                 {% endif %}
                     
                                 {% for page in range(1, products.lastPage) %}
@@ -277,7 +388,7 @@
                                 {% endfor %}
                     
                                 {% if products.lastPage > products.currentPage %}
-                                    <li class="page-item"><a class="page-link" href="{{ products.nextPageUrl }}{{params}}">Indiki</a></li>
+                                    <li class="page-item"><a class="page-link" href="{{ products.nextPageUrl }}{{params}}">{{ 'paginationIndiki'|_ }}</a></li>
                                 {% endif %}
                             </ul>
                         </nav>
@@ -289,4 +400,47 @@
         </div>
     {% endif %}
     </div>
-</section>
+</section>
+
+
+{% put scripts %}
+<script>
+    function getCategories(catId) {
+        if(catId == ''){
+            return;
+        }
+        $.request('onGetCategorySubs', {
+        data: {'mainCat': catId},
+        success: function(data) {
+                 if(data.length > 0){
+                     $('#subcategory').prop("disabled", false);
+                     $('#subcategory').html(`<option value="">Subkategoriýa saýla</option>`);
+                     for (var sub of data) {
+                         $('#subcategory').append(`<option value="`+sub.slug+`">`+sub.name+`</option>`);
+                     }
+                 }else{
+                     $('#subcategory').prop("disabled", true);
+                 }
+                
+            }
+        });   
+    }
+    
+    function sortHandle() {
+        event.preventDefault();
+        let sort = document.getElementById("sort_input");
+        let value = sort.value;
+        submitForm(value);
+    }
+
+    function submitForm(value) {
+        let form = document.getElementById("filter_form");
+        let sort = document.createElement("input");
+        sort.name = "sort";
+        sort.type = "hidden";
+        sort.value = value;
+        form.appendChild(sort);
+        form.submit()
+    }
+</script>
+{% endput %}

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

@@ -1,13 +1,15 @@
 {% set order = __SELF__.order %}
+{% set total = __SELF__.total %}
 <!-- 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>
+                <h5>{{ 'zakaz.Zakaz'|_ }}</h5>
                 <ol class="breadcrumb">
-                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">Esasy sahypa</a></li>
+                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">{{ 'breadcrumbEsasySahypa'|_ }}</a></li>
-                    <li class="breadcrumb-item active">Zakaz # {{ order.order_id }}</li>
+                    <li class="breadcrumb-item"><a href="{{ 'my-orders'|page }}">{{ 'breadcrumbYza'|_ }}</a></li>
+                    <li class="breadcrumb-item active">{{ 'zakaz.Zakaz'|_ }} # {{ order.order_id }}</li>
                 </ol>
             </div>
         </div>
@@ -25,11 +27,11 @@
                         <table class="table table-bordered mb-30">
                             <thead>
                                 <tr>
-                                    <th scope="col">Surat</th>
+                                    <th scope="col">{{ 'product.Surat'|_ }}</th>
-                                    <th scope="col">Haryt ady</th>
+                                    <th scope="col">{{ 'product.HarytAdy'|_ }}</th>
-                                    <th scope="col">Mukdary</th>
+                                    <th scope="col">{{ 'checkout.Mukdary'|_ }}</th>
-                                    <th scope="col">Bahasy</th>
+                                    <th scope="col">{{ 'checkout.Bahasy'|_ }}</th>
-                                    <th scope="col">Jemi</th>
+                                    <th scope="col">{{ 'checkout.Jemi'|_ }}</th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -45,6 +47,7 @@
                                     <td>{{ item.price }} TMT</td>
                                     <td>{{ item.qty * item.price }} TMT</td>
                                 </tr>
+                                {% set total = total + (item.price * item.qty) %}
                             {% endfor %}
                                 
                             </tbody>
@@ -52,38 +55,25 @@
                     </div>
                 </div>
             </div>
-        </div>
+            <div class="col-12 col-lg-7 ml-auto">
-        <div class="col-12 col-lg-7 ml-auto">
+                <div class="cart-total-area">
-            <div class="cart-total-area">
+                    <h5 class="mb-3">{{ 'checkout.Jemi'|_ }}</h5>
-                <h5 class="mb-3">Cart Totals</h5>
+                    <div class="table-responsive">
-                <div class="table-responsive">
+                        <table class="table mb-0">
-                    <table class="table mb-0">
+                            <tbody>
-                        <tbody>
+                                <tr>
-                            <tr>
+                                    <td>{{ 'checkout.HarytlarynJemi'|_ }}</td>
-                                <td>Sub Total</td>
+                                    <td>{{ total }} TMT</td>
-                                <td>$56.00</td>
+                                </tr>
-                            </tr>
+                            </tbody>
-                            <tr>
+                        </table>
-                                <td>Shipping</td>
+                    </div>
-                                <td>$10.00</td>
-                            </tr>
-                            <tr>
-                                <td>VAT (10%)</td>
-                                <td>$5.60</td>
-                            </tr>
-                            <tr>
-                                <td>Total</td>
-                                <td>$71.60</td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-                <div class="checkout_pagination d-flex justify-content-end mt-3">
-                    <a href="checkout-4.html" class="btn btn-primary mt-2 ml-2 d-none d-sm-inline-block">Go Back</a>
-                    <a href="checkout-complate.html" class="btn btn-primary mt-2 ml-2">Confirm</a>
                 </div>
             </div>
         </div>
+
+
+
     </div>
 </div>
 <!-- Cart Area End -->

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

@@ -33,9 +33,17 @@
                                         <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>
+                                    <h5 class="price">
+                                        {% if product.vendor.web2 > 0 %}
+                                            <del style="color: rgb(253, 0, 24);">{{ product.price }} TMT</del>
+                                                {{ product.getDiscountedPrice(product.vendor.web2) }} TMT
+                                            {% else %}
+                                                {{ product.price }} TMT
+                                        {% endif %}
+                                    </h5>
+                                    <span class="badge ml-2 {{ product.stock == 0 ? 'badge-secondary' : 'badge-success' }}">{{ product.stock == 0 ? 'productAdd.ZakazaGelyar'|_ : 'productAdd.ElimizdeBar'|_ }}</span>
                                     <p>{{ html_limit(product.description, 100) }}</p>
-                                    <a href="{{ 'product'|page({id: product.id}) }}">Giňişleýin maglumat</a>
+                                    <a href="{{ 'product'|page({id: product.id}) }}">{{ 'modal.GinisleyinMaglumat'|_ }}</a>
                                     
                                 </div>
                                 <!-- Add to Cart Form -->
@@ -45,11 +53,11 @@
                                     </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>
+                                            <a href="#" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">{{ 'product.SebedeGos'|_ }}</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>
+                                                <a href="{{ 'login'|page }}" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">{{ 'product.SebedeGos'|_ }}</a>
                                          </div>
                                     {% endif %}
                                     <!-- Wishlist -->
@@ -87,10 +95,10 @@
     <div class="container h-100">
         <div class="row h-100 align-items-center">
             <div class="col-12">
-                <h5>Harytlar</h5>
+                <h5>{{ 'breadcrumbHarytlar'|_ }}</h5>
                 <ol class="breadcrumb">
-                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">Esasy sahypa</a></li>
+                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">{{ 'breadcrumbEsasySahypa'|_ }}</a></li>
-                    <li class="breadcrumb-item active">Haryt gözleg</li>
+                    <li class="breadcrumb-item active">{{ 'breadcrumbHarytGozleg'|_ }}</li>
                     <li class="breadcrumb-item active">{{ keyword }}</li>
                 </ol>
             </div>
@@ -112,7 +120,7 @@
                 </div>
                 <div class="col-6 d-block mx-auto">
                    <div class="text-center">
-                      <p>Şu wagtlykça bu bölümde haryt ýok</p>
+                      <p>{{ 'product.BrandMagazinlarynHarytlaryYuklenyar'|_ }}</p>
                   </div>
                 </div>
               </div>
@@ -131,11 +139,11 @@
                             </form>
                             
                                 <select class="form-control" onchange="sortHandle()" id="sort_input">
-                                    <option value="">Saýlanmadyk</option>
+                                    <option value="">{{ 'sortSaylanmadyk'|_ }}</option>
-                                    <option value="-price" {% if input('sort') == '-price' %} selected {% endif %}>Gymmatdan arzana</option>
+                                    <option value="-price" {% if input('sort') == '-price' %} selected {% endif %}>{{ 'sortGymmatdanArzana'|_ }}</option>
-                                    <option value="price" {% if input('sort') == 'price' %} selected {% endif %}>Arzandan gymmada</option>
+                                    <option value="price" {% if input('sort') == 'price' %} selected {% endif %}>{{ 'sortArzandanGymmada'|_ }}</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 %}>{{ 'sortTazedenKona'|_ }}</option>
-                                    <option value="created_at" {% if input('sort') == 'created_at' %} selected {% endif %}>Köneden täzä</option>
+                                    <option value="created_at" {% if input('sort') == 'created_at' %} selected {% endif %}>{{ 'sortKonedenTaza'|_ }}</option>
                                 </select>
                             </form>
                         </div>
@@ -179,20 +187,28 @@
                                     {% 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>
+                                            <a href="#"><i class="icofont-shopping-cart"></i> {{ 'product.SebedeGos'|_ }}</a>
                                         </div>
                                     {% else %}
                                         <div class="product_add_to_cart">
-                                            <a href="{{ 'login'|page }}"><i class="icofont-shopping-cart"></i> Sebede goş</a>
+                                            <a href="{{ 'login'|page }}"><i class="icofont-shopping-cart"></i> {{ 'product.SebedeGos'|_ }}</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>
+                                        <a href="#" data-toggle="modal" data-target="#quickview{{product.id}}"><i class="icofont-eye-alt"></i> {{ 'parallaxDolyMaglumat'|_ }}</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>
+                                    <h6 class="product-price">
+                                        {% if product.vendor.web2 > 0 %}
+                                            <del style="color: rgb(253, 0, 24);">{{ product.price }} TMT</del>
+                                                {{ product.getDiscountedPrice(product.vendor.web2) }} TMT
+                                            {% else %}
+                                                {{ product.price }} TMT
+                                        {% endif %}
+                                    </h6>
+                                    <span class="badge mt-2 {{ product.stock == 0 ? 'badge-secondary' : 'badge-success' }}">{{ product.stock == 0 ? 'productAdd.ZakazaGelyar'|_ : 'productAdd.ElimizdeBar'|_ }}</span>
                                 </div>
                             </div>
                         </div>
@@ -205,7 +221,7 @@
                         <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>
+                                    <li class="page-item"><a class="page-link" href="{{ products.previousPageUrl }}{{params}}">{{ 'paginationOnki'|_ }}</a></li>
                                 {% endif %}
                     
                                 {% for page in range(1, products.lastPage) %}
@@ -219,7 +235,7 @@
                                 {% endfor %}
                     
                                 {% if products.lastPage > products.currentPage %}
-                                    <li class="page-item"><a class="page-link" href="{{ products.nextPageUrl }}{{params}}">Indiki</a></li>
+                                    <li class="page-item"><a class="page-link" href="{{ products.nextPageUrl }}{{params}}">{{ 'paginationIndiki'|_ }}</a></li>
                                 {% endif %}
                             </ul>
                         </nav>

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

@@ -4,9 +4,9 @@
         <div class="container h-100">
             <div class="row h-100 align-items-center">
                 <div class="col-12">
-                    <h5>Dükanyň sazlamalary</h5>
+                    <h5>{{ 'profileDropdown.DukanSazlamalary'|_ }}</h5>
                     <ol class="breadcrumb">
-                        <li class="breadcrumb-item"><a href="{{ 'index'|page }}">Esasy sahypa</a></li>
+                        <li class="breadcrumb-item"><a href="{{ 'index'|page }}">{{ 'breadcrumbEsasySahypa'|_ }}</a></li>
                         <li class="breadcrumb-item active">{{ user.name }}</li>
                     </ol>
                 </div>
@@ -21,23 +21,18 @@
             <div class="row">
 
 
-                <div class="col-12 col-lg-12">
+                {% partial "user/menu" %}
+        
+                <div class="col-12 col-lg-9">
                     <div class="my-account-content mb-50">
         
-                        <div class="single_catagory_slide">
+                        <div class="single_catagory_slide mb-5">
                             <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, {{ user.name }}">
                             </a>
                             <p class="mt-3">{{ user.name }}</p>
                         </div>
-                    </div>
+                        
-                </div>
-
-
-
-                <div class="col-12 col-lg-12">
-                    <div class="my-account-content mb-50">
-                        <h5 class="mb-3">Dükan maglumatlary</h5>
 
                         <form action="#" method="post" id="vendorForm"
                                 data-request="onSave"
@@ -50,35 +45,45 @@
                             <div class="row">
                                 <div class="col-12 col-lg-6">
                                     <div class="form-group">
-                                        <label for="firstName">Dükanyň ady</label>
+                                        <label for="firstName">{{ 'shop.DukanynAdy'|_ }}</label>
-                                        <input type="text" class="form-control" name="vendorName" id="vendorName" value="{{ user.shop_title }}" placeholder="Dükanyň ady" required>
+                                        <input type="text" class="form-control" name="vendorName" id="vendorName" value="{{ user.shop_title }}" placeholder="{{ 'shop.DukanynAdy'|_ }}" required>
                                     </div>
                                 </div>
                                 <div class="col-12 col-lg-6">
                                     <div class="form-group">
-                                        <label for="lastName">Slogan</label>
+                                        <label for="lastName">{{ 'shop.Slogan'|_ }}</label>
-                                        <input type="text" class="form-control" name="slogan" id="slogan" value="{{ user.slogan }}" placeholder="Slogan" required>
+                                        <input type="text" class="form-control" name="slogan" id="slogan" value="{{ user.slogan }}" placeholder="{{ 'shop.Slogan'|_ }}" required>
+                                    </div>
+                                </div>
+                                <div class="col-12 col-lg-6">
+                                    <div class="form-group">
+                                        <label for="displayName">{{ 'shop.IsWagty'|_ }}</label>
+                                        <input type="text" class="form-control" name="workTime" id="workTime"  value="{{ user.work_time }}" placeholder="{{ 'shop.IsWagty'|_ }}" required>
+                                    </div>
+                                </div>
+                                <div class="col-12 col-lg-6">
+                                    <div class="form-group">
+                                        <label for="discount">{{ 'shop.Arzanladys'|_ }}</label>
+                                        <input type="decimal" class="form-control" name="discount" id="discount"  value="{{ user.web2 }}" placeholder="{{ 'shop.Arzanladys'|_ }}">
                                     </div>
                                 </div>
                                 <div class="col-12">
                                     <div class="form-group">
-                                        <label for="displayName">Iş wagty</label>
+                                        <label for="description">{{ 'shop.Beyan'|_ }}</label>
-                                        <input type="text" class="form-control" name="workTime" id="workTime"  value="{{ user.work_time }}" placeholder="Iş wagty" required>
+                                        <textarea class="form-control" id="description" cols="30" name="description" rows="10" placeholder="{{ 'shop.Beyan'|_ }}" style="height: 160px;" required>{{ user.description|striptags|raw }}</textarea>
+                                        
                                     </div>
                                 </div>
                                 <div class="col-12">
-                                    <div class="form-group">
+                                    <button type="submit" class="btn btn-primary">{{ 'button.Uytgetmek'|_ }}</button>
-                                        <label for="emailAddress">Beýan</label>
-                                        <input type="text" class="form-control" name="description" id="description" value="{{ user.description }}" placeholder="Beýan" required>
-                                    </div>
-                                </div>
-                                <div class="col-12">
-                                    <button type="submit" class="btn btn-primary">Üýtgetmek</button>
                                 </div>
                             </div>
                         </form>
+                        
                     </div>
                 </div>
+
+
             </div>
         </div>
     </section>

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

@@ -6,10 +6,10 @@
         <div class="container h-100">
             <div class="row h-100 align-items-center">
                 <div class="col-12">
-                    <h5>Haryt barada giňişleýin maglumat</h5>
+                    <h5>{{ 'modal.GinisleyinMaglumat'|_ }}</h5>
                     <ol class="breadcrumb">
-                        <li class="breadcrumb-item"><a href="{{ 'index'|page }}">Esasy sahypa</a></li>
+                        <li class="breadcrumb-item"><a href="{{ 'index'|page }}">{{ 'breadcrumbEsasySahypa'|_ }}</a></li>
-                        <li class="breadcrumb-item"><a href="#">Harytlar</a></li>
+                        <li class="breadcrumb-item"><a href="#">{{ 'breadcrumbHarytlar'|_ }}</a></li>
                         <li class="breadcrumb-item active">{{ product.name }}</li>
                     </ol>
                 </div>
@@ -66,14 +66,21 @@
                                 <i class="fa fa-star" aria-hidden="true"></i>
                                 <i class="fa fa-star" aria-hidden="true"></i>
                             {% endif %}
-                            <span class="text-muted">({{ product.comments_count }} teswir)</span>
+                            <span class="text-muted">({{ product.comments_count }} {{ 'product.Kammentaria'|_ }})</span>
                         </div>
-                        <h4 class="price mb-4">{{ product.price }} TMT</h4>
+                        <h4 class="price mb-2">
+                            {% if product.vendor.web2 > 0 %}
+                                <del style="color: rgb(253, 0, 24);">{{ product.price }} TMT</del>
+                                    {{ product.getDiscountedPrice(product.vendor.web2) }} TMT
+                                {% else %}
+                                    {{ product.price }} TMT
+                            {% endif %}
+                        </h4> <span class="badge mb-2 {{ product.stock == 0 ? 'badge-secondary' : 'badge-success' }}">{{ product.stock == 0 ? 'productAdd.ZakazaGelyar'|_ : 'productAdd.ElimizdeBar'|_ }}</span>
 
                         <!-- Overview -->
                         <div class="short_overview mb-4">
                             <div class="row">
-                                <div class="col-2">Satyjy:</div>
+                                <div class="col-2">{{ 'product.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>
@@ -91,13 +98,13 @@
                              </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>
+                                        <a href="{{ 'login'|page }}" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">{{ 'product.SebedeGos'|_ }}</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>
+                                        <a href="{{ product.files[0].path }}" target="_blank" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3" download>{{ 'product.3dmodel'|_ }}</a>
                                  </div>
                             {% endif %}
                         </form>
@@ -112,9 +119,9 @@
                                     data-request-data="product_id: {{ product.id }}" 
                                     href="#"><i class="icofont-heart"></i></a>
                             {% else %}
-                                <a class="add_to_wishlist" href="{{ 'login'|page }}"><i class="fa fa-heart" aria-hidden="true"></i> Halanlaryma</a>
+                                <a class="add_to_wishlist" href="{{ 'login'|page }}"><i class="fa fa-heart" aria-hidden="true"></i> {{ 'footer.Halanlarym'|_ }}</a>
                             {% endif %}
-                            <a class="share_with_friend" id="copy-{{ product.id }}" data-id="{{ product.id }}" href="#" data-link="{{ 'product'|page({id: product.id}) }}"><i class="fa fa-share" aria-hidden="true"></i> Paýlaşmak</a>
+                            <a class="share_with_friend" id="copy-{{ product.id }}" data-id="{{ product.id }}" href="#" data-link="{{ 'product'|page({id: product.id}) }}"><i class="fa fa-share" aria-hidden="true"></i> {{ 'product.Paylasmak'|_ }}</a>
                         </div>
 
                     </div>
@@ -129,25 +136,25 @@
                         <!-- Tabs -->
                         <ul class="nav nav-tabs" role="tablist" id="product-details-tab">
                             <li class="nav-item">
-                                <a href="#description" class="nav-link active" data-toggle="tab" role="tab">Giňişleýin maglumat</a>
+                                <a href="#description" class="nav-link active" data-toggle="tab" role="tab">{{ 'modal.GinisleyinMaglumat'|_ }}</a>
                             </li>
                             {% if user %}
                             <li class="nav-item">
-                                <a href="#reviews" class="nav-link" data-toggle="tab" role="tab">Teswirler <span class="text-muted">({{ product.comments_count }})</span></a>
+                                <a href="#reviews" class="nav-link" data-toggle="tab" role="tab">{{'teswir'|_}} <span class="text-muted">({{ product.comments_count }})</span></a>
                             </li>
                             {% endif %}
                             <li class="nav-item">
-                                <a href="#addi-info" class="nav-link" data-toggle="tab" role="tab">Goşmaça maglumat</a>
+                                <a href="#addi-info" class="nav-link" data-toggle="tab" role="tab">{{ 'product.GosmacaMaglumat'|_ }}</a>
                             </li>
                             <li class="nav-item">
-                                <a href="#refund" class="nav-link" data-toggle="tab" role="tab">Yzyna tabşyrmak &amp; Zakazy ýatyrmak</a>
+                                <a href="#refund" class="nav-link" data-toggle="tab" role="tab">{{ 'product.YzynaTabsyrmak'|_ }} &amp; {{ 'product.ZakazyYatyrmak'|_ }}</a>
                             </li>
                         </ul>
                         <!-- Tab Content -->
                         <div class="tab-content">
                             <div role="tabpanel" class="tab-pane fade show active" id="description">
                                 <div class="description_area">
-                                    <h5>Giňişleýin maglumat</h5>
+                                    <h5>{{ 'modal.GinisleyinMaglumat'|_ }}</h5>
                                     <p>{{ product.description|raw }}</p>
                                 </div>
                             </div>
@@ -178,7 +185,7 @@
                                 </div>
 
                                 <div class="submit_a_review_area mt-20">
-                                    <h4>Teswir ýazmak</h4>
+                                    <h4>{{ 'product.KammentariaYazmak'|_ }}</h4>
                                     <form id="commentForm"
                                         data-request="onCommentSave"
                                         data-request-flash
@@ -206,7 +213,7 @@
                                             <input type="hidden" name="product_id" value="{{ product.id }}">
                                             <textarea class="form-control" name="comment" id="comment" rows="5" data-max-length="300"></textarea>
                                         </div>
-                                        <button type="submit" class="btn btn-primary">Teswiri ugratmak</button>
+                                        <button type="submit" class="btn btn-primary">{{ 'product.KammentariaUgratmak'|_ }}</button>
                                     </form>
                                 </div>
                             </div>
@@ -215,26 +222,14 @@
 
                             <div role="tabpanel" class="tab-pane fade" id="addi-info">
                                 <div class="additional_info_area">
-                                    <h5>Goşmaça maglumatlar</h5>
+                                    <h5>{{ 'product.GosmacaMaglumat'|_ }}</h5>
                                     <p>{{ product.description|raw }}</p>
                                 </div>
                             </div>
 
                             <div role="tabpanel" class="tab-pane fade" id="refund">
                                 <div class="refund_area">
-                                    <h6>Harydy yzyna gaýtarmak</h6>
+                                    {% content 'refund' %}
-                                    <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>

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

@@ -6,10 +6,12 @@
         <div class="container h-100">
             <div class="row h-100 align-items-center">
                 <div class="col-12">
-                    <h5>Sargyt maglumaty</h5>
+                    <h5>{{ 'order.SargytMaglumaty'|_ }}</h5>
                     <ol class="breadcrumb">
-                        <li class="breadcrumb-item"><a href="{{ 'index'|page }}">Esasy sahypa</a></li>
+                        <li class="breadcrumb-item"><a href="{{ 'index'|page }}">{{ 'breadcrumbEsasySahypa'|_ }}</a></li>
-                        <li class="breadcrumb-item active"># {{ order }} sargyt</li>
+                        <li class="breadcrumb-item"><a href="{{ 'vendor-sales'|page }}">{{ 'breadcrumbYza'|_ }}</a></li>
+                        <li class="breadcrumb-item active"># {{ order.id }} {{ 'order.Sargyt'|_ }}</li>
+                        
                     </ol>
                 </div>
             </div>
@@ -24,36 +26,36 @@
                 <div class="row">
                     <div class="col-12">
                         <div class="checkout_details_area clearfix">
-                            <h5 class="mb-30">Harytlar</h5>
+                            <h5 class="mb-30">{{ 'breadcrumbHarytlar'|_ }}</h5>
     
                             <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">{{ 'checkout.Surat'|_ }}</th>
-                                                <th scope="col">Haryt ady</th>
+                                                <th scope="col">{{ 'checkout.HarytAdy'|_ }}</th>
-                                                <th scope="col">Bahasy</th>
+                                                <th scope="col">{{ 'checkout.Bahasy'|_ }}</th>
-                                                <th scope="col">Mukdary</th>
+                                                <th scope="col">{{ 'checkout.Mukdary'|_ }}</th>
-                                                <th scope="col">Umumy</th>
+                                                <th scope="col">{{ 'checkout.Umumy'|_ }}</th>
                                             </tr>
                                         </thead>
                                         <tbody>
                                             {% set total_price = 0 %}
-                                            {% for order in sales %}
+                                            {% for saleOrder in sales %}
                                             <tr>
                                                 <td>
-                                                    <a href="{{ 'product'|page({id: order.product.id}) }}">
+                                                    <a href="{{ 'product'|page({id: saleOrder.product.id}) }}">
-                                                        <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 }}">
+                                                        <img src="{{ saleOrder.product.images[0].thumb(60,60, { mode: 'crop' }) }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi, {{ saleOrder.product.name }}">
                                                     </a>
                                                 </td>
                                                 <td>
-                                                    <a href="{{ 'product'|page({id: order.product.id}) }}">{{ order.product.name }}</a>
+                                                    <a href="{{ 'product'|page({id: saleOrder.product.id}) }}">{{ saleOrder.product.name }}</a>
                                                 </td>
-                                                <td>{{ order.product.price }} TMT</td>
+                                                <td>{{ saleOrder.product.price }} TMT</td>
-                                                <td>{{ order.qty }}</td>
+                                                <td>{{ saleOrder.qty }}</td>
-                                                <td>{{ order.product.price * order.qty }} TMT</td>
+                                                <td>{{ saleOrder.product.price * saleOrder.qty }} TMT</td>
-                                                {% set total_price = total_price + (order.product.price * order.qty) %}
+                                                {% set total_price = total_price + (saleOrder.product.price * saleOrder.qty) %}
                                             </tr>
                                             {% endfor %}
                                         </tbody>
@@ -62,33 +64,73 @@
                             </div>
                         </div>
                     </div>
-    
+                    
-                    <div class="col-12 col-lg-7 ml-auto">
+                </div>
-                        <div class="cart-total-area">
+                
-                            <h5 class="mb-3">Zakaz jemi</h5>
+                <div class="row">
-                            <div class="table-responsive">
+                        <div class="col-6">
-                                <table class="table mb-0">
+                            <div class="cart-total-area">
-                                    <tbody>
+                                <h5 class="mb-3">{{ 'checkout.BeylekiMaglumatlar'|_ }}</h5>
-                                        <tr>
+                                
-                                            <td>Jemi</td>
+                                <div class="table-responsive">
-                                            <td>{{ total_price }} TMT</td>
+                                    <table class="table mb-0">
-                                        </tr>
+                                        <tbody>
-                                    </tbody>
+                                            <tr>
-                                </table>
+                                                <td>{{ 'checkout.Ulanyjy'|_ }}</td>
+                                                <td>{{ order.user.name }}</td>
+                                            </tr>
+                                            <tr>
+                                                <td>{{ 'footer.TelefonTitle'|_ }}</td>
+                                                <td>+993 {{ order.user.username }}</td>
+                                            </tr>
+                                            <tr>
+                                                <td>{{ 'checkout.Address'|_ }}</td>
+                                                <td>{{ order.address }}</td>
+                                            </tr>
+                                            <tr>
+                                                <td>{{ 'checkout.Bellik'|_ }}</td>
+                                                <td>{{ order.note }}</td>
+                                            </tr>
+                                            
+                                        </tbody>
+                                    </table>
+                                </div>
                             </div>
-                            <div class="checkout_pagination d-flex justify-content-end mt-3">
+                        </div>
-                                <form action="#"
+        
-                                    data-request="onConfirm"
+                        <div class="col-6">
-                                    data-request-flash
+                        
-                                    data-request-validate
+                            <div class="cart-total-area">
-                                >
+                                <h5 class="mb-3">{{ 'checkout.Jemi'|_ }}</h5>
-                                    <input type="hidden" name="order_id" value="{{ order }}">
+                                <div class="table-responsive">
-                                    <button type="submit" class="btn btn-primary mt-2 ml-2">Zakazy kabul etmek</button>    
+                                    <table class="table mb-0">
-                                </form>
+                                        <tbody>
+                                            <tr>
+                                                <td>{{ 'checkout.Jemi'|_ }}</td>
+                                                <td>{{ total_price }} TMT</td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                                <div class="checkout_pagination d-flex justify-content-end mt-3">
+                                    <form action="#"
+                                        data-request="onConfirm"
+                                        data-request-flash
+                                        data-request-validate
+                                    >
+                                        <input type="hidden" name="order_id" value="{{ order.id }}">
+                                        {% if order.status != 'new' %}                
+                                            <a href="{{ 'print'|page }}" target="_blank" class="btn btn-primary mt-2 ml-2">{{ 'order.Print'|_ }}</a>    
+                                        {% else %}
+                                            <button type="submit" class="btn btn-primary mt-2 ml-2">{{ 'zakaz.KabulEtmek'|_ }}</button>
+                                        {% endif %}
+                                    </form>
+                                </div>
                             </div>
                         </div>
                     </div>
-                </div>
+                
+                
             </div>
         </div>
         <!-- Checkout Area End -->

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

@@ -40,9 +40,17 @@
                                         <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>
+                                    <h5 class="price">
+                                        {% if product.vendor.web2 > 0 %}
+                                            <del style="color: rgb(253, 0, 24);">{{ product.price }} TMT</del>
+                                                <!-- {{ product.getDiscountedPrice(product.vendor.web2) }} TMT -->
+                                                {{ product.vendor.web2 }}
+                                            {% else %}
+                                                {{ product.price }} TMT
+                                        {% endif %}
+                                    </h5> <span class="badge ml-2 {{ product.stock == 0 ? 'badge-secondary' : 'badge-success' }}">{{ product.stock == 0 ? 'productAdd.ZakazaGelyar'|_ : 'productAdd.ElimizdeBar'|_ }}</span>
                                     <p>{{ html_limit(product.description, 100) }}</p>
-                                    <a href="{{ 'product'|page({id: product.id}) }}">Giňişleýin maglumat</a>
+                                    <a href="{{ 'product'|page({id: product.id}) }}">{{ 'modal.GinisleyinMaglumat'|_ }}</a>
                                 </div>
                                 <!-- Add to Cart Form -->
                                 <form class="cart" method="post">
@@ -51,11 +59,11 @@
                                     </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>
+                                            <a href="#" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">{{ 'product.SebedeGos'|_ }}</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>
+                                                <a href="{{ 'login'|page }}" class="btn btn-primary mt-1 mt-md-0 ml-1 ml-md-3">{{ 'product.SebedeGos'|_ }}</a>
                                          </div>
                                     {% endif %}
                                     <!-- Wishlist -->
@@ -94,8 +102,8 @@
             <div class="col-12">
             <!--     <h5>Harytlar</h5> -->
                 <ol class="breadcrumb">
-                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">Esasy sahypa</a></li>
+                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">{{ 'breadcrumbEsasySahypa'|_ }}</a></li>
-                    <li class="breadcrumb-item active">Satyjy harytlar</li>
+                    <li class="breadcrumb-item active">{{ 'breadcrumbSatyjyHarytlar'|_ }}</li>
                     <li class="breadcrumb-item active">{{ userProfile.name }}</li>
                 </ol>
             </div>
@@ -126,7 +134,7 @@
 <section class="chat-wrapper-section display-none" id="chatSection" style="background-color: rgb(238, 238, 238); border-top: 5px solid #F37B1C;">
     <div class="chat_area2" id="chatroom">
         <div class="chat_area-inner">
-            <button onclick="loadMoreMeassges()" id="more_btn" data-chatroom-id="{{ chatroom.id }}" data-skip="5">Öňki hatlar</button>
+            <button onclick="loadMoreMeassges()" id="more_btn" data-chatroom-id="{{ chatroom.id }}" data-skip="5">{{ 'chat.OnkiHatlar'|_ }}</button>
 
             {% for message in result %}
                 <div class="{{ message.sender_id == authUser ? 'my_message2' : 'friend_message2' }}">
@@ -143,7 +151,7 @@
                 <input type="hidden" name="reciver_id" value="{{ userProfile.id }}">
                 <input type="hidden" name="chatroom_id" value="{{ chatroom.id }}">
                 <div class="message_input2">
-                    <input type="text" name="msg" id="order-notes" placeholder="Hatyňyz..." class="form-control" style="padding-right:45px">
+                    <input type="text" name="msg" id="order-notes" placeholder="{{ 'inputPlaceholder.Hatynyz'|_ }}" class="form-control" style="padding-right:45px">
                 </div>
                 <button class="message_btn2" type="submit" data-attach-loading="">
                     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 23">

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

@@ -4,10 +4,10 @@
     <div class="container h-100">
         <div class="row h-100 align-items-center">
             <div class="col-12">
-                <h5>Gelen sargytlar</h5>
+                <h5>{{ 'profileDropdown.GelenSargytlar'|_ }}</h5>
                 <ol class="breadcrumb">
-                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">Esasy sahypa</a></li>
+                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">{{ 'breadcrumbEsasySahypa'|_ }}</a></li>
-                    <li class="breadcrumb-item active">Gelen sargytlar</li>
+                    <li class="breadcrumb-item active">{{ 'profileDropdown.GelenSargytlar'|_ }}</li>
                 </ol>
             </div>
         </div>
@@ -19,15 +19,17 @@
 <div class="wishlist-table section_padding_100 clearfix">
     <div class="container">
         <div class="row">
-            <div class="col-12">
+            {% partial "user/menu" %}
+        
+            <div class="col-12 col-lg-9">
                 <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">{{ 'zakaz.TertipBelgisi'|_ }}</th>
-                                    <th scope="col">Wagty</th>
+                                    <th scope="col">{{ 'zakaz.Wagty'|_ }}</th>
-                                    <th scope="col">Status</th>
+                                    <th scope="col">{{ 'zakaz.Status'|_ }}</th>
                                     <th scope="col"></th>
                                 </tr>
                             </thead>
@@ -39,7 +41,7 @@
                                         <td>{{ sale.created_at.format('d.m.Y') }}</td>
                                         <td>
                                             <span class="badge {{ sale.status == 'new' ? 'badge-secondary' : 'badge-success' }}">{{ sale.status == 'new' ? 'Täze sargyt' : 'Kabul edildi' }}</span> </td>
-                                        <td align="center"><a href="{{ 'vendor-sale-detail'|page({id: sale.order_id}) }}" class="btn btn-primary btn-sm">Sargydy görmek</a></td>
+                                        <td align="center"><a href="{{ 'vendor-sale-detail'|page({id: sale.order_id}) }}" class="btn btn-primary btn-sm">{{ 'order.SargydyGormek'|_ }}</a></td>
                                     </tr>
                                 {% endfor %}
                             </tbody>
@@ -51,7 +53,7 @@
                                 <nav aria-label="Page navigation">
                                     <ul class="pagination pagination-sm justify-content-center">
                                         {% if sales.currentPage > 1 %}
-                                            <li class="page-item"><a class="page-link" href="{{ sales.previousPageUrl }}">Öňki</a></li>
+                                            <li class="page-item"><a class="page-link" href="{{ sales.previousPageUrl }}">{{ 'paginationOnki'|_ }}</a></li>
                                         {% endif %}
 
                                         {% for page in range(1, sales.lastPage) %}
@@ -59,7 +61,7 @@
                                         {% endfor %}
 
                                         {% if sales.lastPage > sales.currentPage %}
-                                            <li class="page-item"><a class="page-link" href="{{ sales.nextPageUrl }}">Indiki</a></li>
+                                            <li class="page-item"><a class="page-link" href="{{ sales.nextPageUrl }}">{{ 'paginationIndiki'|_ }}</a></li>
                                         {% endif %}
                                     </ul>
                                 </nav>
@@ -69,6 +71,8 @@
 
                     </div>
                 </div>
+                
+                
             </div>
         </div>
     </div>

plugins/tps/birzha/console/AddKeywordToProducts.php

@@ -0,0 +1,64 @@
+<?php namespace Tps\Birzha\Console;
+
+use Illuminate\Console\Command;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputArgument;
+use TPS\Birzha\Models\Product;
+use TPS\Birzha\Models\Category;
+use Illuminate\Support\Facades\Log;
+
+
+class AddKeywordToProducts extends Command
+{
+    /**
+     * @var string The console command name.
+     */
+    protected $name = 'birzha:addkeywordtoproducts';
+
+    /**
+     * @var string The console command description.
+     */
+    protected $description = 'Adding keyword to old products using their category,name and slugs';
+
+    /**
+     * Execute the console command.
+     * @return void
+     */
+    public function handle()
+    {
+        $products = Product::orderBy('id', 'asc')->get();
+        foreach($products as $product){
+            $keyword = $product->name.' '.$product->slug;
+            foreach($product->categories as $category){
+                $keyword = $keyword.' '.$category->name.' '.$category->slug;
+                if($category->primary_key > 0){
+                    $keyword = $keyword.' '.$category->parent->name.' '.$category->parent->slug;
+
+                    if($category->parent->primary_key > 0){
+                        $keyword = $keyword.' '.$category->parent->parent->name.' '.$category->parent->parent->slug;
+                    }
+                }
+            }
+            $product->keyword = $keyword;
+            $product->save();
+        }
+    }
+
+    /**
+     * Get the console command arguments.
+     * @return array
+     */
+    protected function getArguments()
+    {
+        return [];
+    }
+
+    /**
+     * Get the console command options.
+     * @return array
+     */
+    protected function getOptions()
+    {
+        return [];
+    }
+}

plugins/tps/birzha/models/Product.php

@@ -176,4 +176,13 @@ class Product extends Model
     public static function resolveMenuItem($item, $url, $theme){
 
     }
+    
+    public function getDiscountedPrice($percentage){
+        if($percentage == '0' || $percentage == '0.00' || $this->price == '0' || $this->price == '0.00'){
+            return $this->price;
+        }
+        $totalPercentage = ($percentage / 100) * $this->price;
+        $newPrice = $this->price - number_format($totalPercentage, 2, '.', '');
+        return number_format($newPrice, 2, '.', '');
+    }
 }

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

@@ -16,7 +16,7 @@ fields:
         label: 'Döredilen senesi'
         mode: datetime
         span: auto
-        readOnly: 1
+        readOnly: 0
         type: datepicker
     ends_at:
         label: 'Gutarýan Senesi'
@@ -116,3 +116,16 @@ tabs:
             type: text
             comment: 'site-da gorunmeli ady'
             tab: Status
+        stock:
+            label: 'Elinizde Barmy?'
+            span: auto
+            default: 1
+            type: switch
+            comment: 'elinizde bar bolsa achyk durmaly'
+            tab: Status
+        keyword:
+            label: 'Gozlenende chykmaly sozler'
+            span: auto
+            type: text
+            comment: 'name diyip gozledende shu harydyn chykmaly bolsa shu yerde giriz otur goyup bgidiwermeli'
+            tab: Status

plugins/tps/birzha/updates/builder_table_update_tps_birzha_products_40.php

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

plugins/tps/birzha/updates/builder_table_update_tps_birzha_products_41.php

@@ -0,0 +1,23 @@
+<?php namespace TPS\Birzha\Updates;
+
+use Schema;
+use October\Rain\Database\Updates\Migration;
+
+class BuilderTableUpdateTpsBirzhaProducts41 extends Migration
+{
+    public function up()
+    {
+        Schema::table('tps_birzha_products', function($table)
+        {
+            $table->boolean('stock')->nullable(false)->unsigned(false)->default(1)->change();
+        });
+    }
+    
+    public function down()
+    {
+        Schema::table('tps_birzha_products', function($table)
+        {
+            $table->integer('stock')->nullable(false)->unsigned(false)->default(1)->change();
+        });
+    }
+}

plugins/tps/birzha/updates/version.yaml

@@ -455,3 +455,9 @@
 1.0.158:
     - 'Updated table tps_birzha_products'
     - builder_table_update_tps_birzha_products_39.php
+1.0.159:
+    - 'Updated table tps_birzha_products'
+    - builder_table_update_tps_birzha_products_40.php
+1.0.160:
+    - 'Updated table tps_birzha_products'
+    - builder_table_update_tps_birzha_products_41.php

themes/gurlushyk/assets/css/style.css

@@ -2181,7 +2181,7 @@ div[id^=quickview] button.close {
   border-radius: 6px; }
   .widget .widget-title {
     font-size: 16px;
-    text-transform: capitalize;
+    /* text-transform: capitalize; */
     margin-bottom: 1rem; }
   .widget .widget-desc label {
     text-transform: capitalize; }
@@ -3083,7 +3083,7 @@ button.mfp-arrow {
     margin-bottom: 0;
     border-bottom: 0; }
   .my-account-navigation li.active a {
-    color: #0f99f3; }
+    color: #ba5603; }
 
 .my-account-content {
   position: relative;

themes/gurlushyk/content/AboutUs.htm

@@ -0,0 +1 @@
+<p><strong>Gurluşyk</strong> – Türkmenistanda alyjylary we satyjylary birleşdirýän onlaýn söwda platformasydyr. Müşderileriň arzan bahalara, has gowy saýlama we amatly hyzmat islegi, näme bolsa-da üýtgewsiz galýar. Häzirki wagtda bu islegleriň hemmesini <strong>gurlushyk.com.tm </strong>web sahypasynda tapyp bilersiňiz. Biziň wezipämiz, islendik ululykdaky telekeçilere, kärhanalara we guramalara ykdysady mümkinçilikler bermek we Türkmenistanda iň köp müşderi gönükdirilen kompaniýa bolmak. Satyjylara ululygyna, gelip çykyşyna ýa-da ýerleşişine garamazdan girmek üçin pes päsgelçilikler bilen öz işini ösdürmäge mümkinçilik berýäris. Siziň ýokary standartlaryňyzyň bardygyny bilýäris. <strong>GURLUSHYK-da</strong> zerur önümleri arzan bahadan tapyp bilersiňiz - aladalanman!</p>

themes/gurlushyk/content/AboutUs.ru.htm

@@ -0,0 +1,2 @@
+<p>
+	<br><strong>Строителъство</strong>-Это торговая онлайн-платформа, объединяющая покупателей и продавцов в Туркменистане. Однако спрос клиентов на более низкие цены, лучший выбор и удобное обслуживание остается постоянным. Теперь все эти требования вы можете найти на сайте <strong>gurlushyk.com.tm</strong>. Наша миссия — предоставлять экономические возможности предпринимателям, предприятиям и организациям любого размера и быть самой клиентоориентированной компанией в Туркменистане. Мы даем возможность продавцам независимо от размера, происхождения или местоположения развивать свой бизнес с низкими входными барьерами. Мы знаем, что у вас высокие стандарты. В <strong>«ГУРЛУШИК»</strong> вы сможете найти нужные вам товары по доступным ценам – не волнуйтесь!</p>

themes/gurlushyk/content/orderCancel.htm

@@ -0,0 +1,15 @@
+<h6><strong>Zakazy ýatyrmak</strong></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> <strong>Hili pes</strong></li>
+	<li><strong><i class="icofont-check"></i> Dostawka haýal</strong></li>
+	<li><strong><i class="icofont-check"></i> Başga haryt geldi</strong></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>

themes/gurlushyk/content/privacy.htm

@@ -0,0 +1,15 @@
+<p><strong><u>“GURLUŞYK”</u></strong></p>
+
+<p skip="true">GURLUŞYK – <span lang="tk">Türkmenistanda alyjylary we satyjylary birleşdirýän onlaýn söwda platformasydyr. Müşderileriň arzan bahalara, has gowy saýlama we amatly hyzmat islegi, näme bolsa-da üýtgewsiz galýar. Häzirki wagtda bu islegleriň hemmesini web sahypasynda tapyp bilersiňiz <a href="//www.gurlushyk.com"><strong>www.gurlushyk.com</strong></a><strong>.tm</strong></span></p>
+
+<p><strong><u>Заявление о миссии:</u></strong></p>
+
+<p>Наша миссия - предоставить экономические возможности предпринимателям, предприятиям и организациям любого размера, и быть самой клиентоориентированной компанией Туркменистана.</p>
+
+<p><strong><u>Продавцам:</u></strong></p>
+
+<p>Мы предлагаем продавцам возможность развивать бизнес с небольшими барьерами для входа, независимо от размера, происхождения или расположения.</p>
+
+<p><strong><u>Покупателям:</u></strong>&nbsp;</p>
+
+<p>Мы знаем, что у вас высокие стандарты. На GURLUŞYK вы сможете найти нужные товары по разумной цене - без забот!</p>

themes/gurlushyk/content/refund.htm

@@ -0,0 +1,15 @@
+<h6><strong>Harydy yzyna gaýtarmak</strong></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> <strong>Hili pes</strong></li>
+	<li><strong><i class="icofont-check"></i> Dostawka haýal</strong></li>
+	<li><strong><i class="icofont-check"></i> Başga haryt geldi</strong></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>

themes/gurlushyk/layouts/default.htm

@@ -1,23 +1,22 @@
-[session]
-security = "all"
-redirect = "login"
-
 [localePicker]
-forceUrl = 0
+forceUrl = 1
 
 [staticMenu]
 code = "top-menu"
 
 [SeoCmsPage]
+
+[session]
+security = "all"
+redirect = "login"
 ==
-<html lang="en">
+<html lang="{{activeLocale}}">
 
 <head>
     {% component 'SeoCmsPage' %}
 
     <meta charset="UTF-8">
-    <meta name="description" content="{{ this.page.meta_description }}">
+    
-    <meta name="title" content="{{ this.page.meta_title }}">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <title>{{ this.page.title }}</title>
@@ -86,6 +85,7 @@ code = "top-menu"
         
     </script>
     
+    
     {% framework extras %}
     
     {% scripts %}

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

@@ -11,6 +11,9 @@ items:
         viewBag:
             locale:
                 ru:
+                    title: 'О нас'
+                    url: ''
+                en:
                     title: ''
                     url: ''
             isHidden: '0'
@@ -106,9 +109,13 @@ items:
         items:
             -
                 title: Mebel
+                nesting: null
                 type: url
                 url: /category-profile/mebel
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -136,10 +143,10 @@ items:
             isExternal: '0'
         items:
             -
-                title: 'Aýnadan Myramor'
+                title: 'Dekor Aýnalar'
                 nesting: null
                 type: url
-                url: /category/products/aynadan-myramorlar
+                url: /category-profile/dekor-aynalar
                 code: ''
                 reference: null
                 cmsPage: null
@@ -152,108 +159,6 @@ items:
                     isHidden: '0'
                     cssClass: '1'
                     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:
-                            title: ''
-                            url: ''
-                    isHidden: '0'
-                    cssClass: '2'
-                    isExternal: '0'
-            -
-                title: 'Duş Kabina'
-                nesting: null
-                type: url
-                url: /category/products/dus-kabina
-                code: ''
-                reference: null
-                cmsPage: null
-                replace: null
-                viewBag:
-                    locale:
-                        ru:
-                            title: ''
-                            url: ''
-                    isHidden: '0'
-                    cssClass: ''
-                    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:
-                            title: ''
-                            url: ''
-                    isHidden: '0'
-                    cssClass: '4'
-                    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:
-                            title: ''
-                            url: ''
-                    isHidden: '0'
-                    cssClass: '1'
-                    isExternal: '0'
-            -
-                title: 'Aýna Potoloklar'
-                nesting: null
-                type: url
-                url: /category-profile/aynalar
-                code: ''
-                reference: null
-                cmsPage: null
-                replace: null
-                viewBag:
-                    locale:
-                        ru:
-                            title: ''
-                            url: ''
-                    isHidden: '0'
-                    cssClass: '2'
-                    isExternal: '0'
-            -
-                title: Umiwalnik
-                nesting: null
-                type: url
-                url: /category/products/umiwalnikler
-                code: ''
-                reference: null
-                cmsPage: null
-                replace: null
-                viewBag:
-                    locale:
-                        ru:
-                            title: ''
-                            url: ''
-                    isHidden: '0'
-                    cssClass: '3'
-                    isExternal: '0'
     -
         title: Lýustralar
         nesting: null
@@ -291,9 +196,13 @@ items:
                     isExternal: '0'
             -
                 title: 'Rother elektrik'
+                nesting: null
                 type: url
                 url: /category-profile/rother-elektrik
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -304,9 +213,13 @@ items:
                     isExternal: '0'
             -
                 title: 'Lux Lighting'
+                nesting: null
                 type: url
                 url: /category-profile/lux-lighting
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     locale:
                         ru:
@@ -349,4 +262,30 @@ items:
             isHidden: '0'
             cssClass: ''
             isExternal: '0'
+    -
+        title: 'Krasgalar we Emusýalar'
+        type: url
+        url: /category-profile/krasgalar-we-emusyalar
+        code: ''
+        viewBag:
+            locale:
+                ru:
+                    title: ''
+                    url: ''
+            isHidden: '0'
+            cssClass: ''
+            isExternal: '0'
+    -
+        title: 'Elektrik önümleri'
+        type: url
+        url: /category-profile/elektrik-onumler
+        code: ''
+        viewBag:
+            locale:
+                ru:
+                    title: ''
+                    url: ''
+            isHidden: '0'
+            cssClass: ''
+            isExternal: '0'
 name: top-menu

themes/gurlushyk/pages/about.htm

@@ -3,16 +3,18 @@ url = "/about"
 layout = "default"
 description = "About us page description"
 is_hidden = 0
+robot_index = "index"
+robot_follow = "follow"
 ==
 <!-- Breadcumb Area -->
 <div class="breadcumb_area">
     <div class="container h-100">
         <div class="row h-100 align-items-center">
             <div class="col-12">
-                <h5>Biz barada</h5>
+                <h5>{{ 'breadcrumbBizbarada'|_ }}</h5>
                 <ol class="breadcrumb">
-                    <li class="breadcrumb-item"><a href="index.html">Esasy sahypa</a></li>
+                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">{{ 'breadcrumbEsasySahypa'|_ }}</a></li>
-                    <li class="breadcrumb-item active">Biz barada</li>
+                    <li class="breadcrumb-item active">{{ 'breadcrumbBizbarada'|_ }}</li>
                 </ol>
             </div>
         </div>
@@ -23,12 +25,7 @@ is_hidden = 0
 <!-- About Us Area -->
 <section class="about_us_area section_padding_50">
     <div class="container">
-        <p>
+        {% content 'AboutUs' %}
-        Gurlushyk – это онлайн торговая площадка, объединяющая покупателей и продавцов по всему Туркменистану. Стремление клиентов к более низким ценам, лучшему выбору и удобному обслуживанию остается неизменным, несмотря ни на что. Сегодня все эти предпочтения можно найти на сайте gurlushyk.com.tm.
-        Наша миссия - предоставить экономические возможности предпринимателям, предприятиям и организациям любого размера, и быть самой клиентоориентированной компанией Туркменистана.
-        Мы предлагаем продавцам возможность развивать бизнес с небольшими барьерами для входа, независимо от размера, происхождения или расположения.
-        Мы знаем, что у вас высокие стандарты. На GURLUSHYK вы сможете найти нужные товары по разумной цене - без забот!
-        </p>
     </div>
 </section>
 <!-- About Us Area -->

themes/gurlushyk/pages/addProduct.htm

@@ -7,9 +7,409 @@ robot_follow = "follow"
 
 [offerform]
 productId = "{{ :productId }}"
-
-[session]
-security = "user"
-redirect = "login"
 ==
-{% component 'offerform' %}
+{% set categories = offerform.categories %}
+{% set subcategories = offerform.subcategories %}
+{% set states = offerform.states %}
+{% set cities = offerform.cities %}
+{% set productIdOption = offerform.productIdOption %}
+{% set productForEditing = offerform.productForEditing %}
+
+
+
+<!-- Breadcumb Area -->
+<div class="breadcumb_area">
+    <div class="container h-100">
+        <div class="row h-100 align-items-center">
+            <div class="col-12">
+                {% if productForEditing %}
+                    <h5>{{ 'productAdd.HarytUytgetmek'|_ }}</h5>
+                {% else %}
+                    <h5>{{ 'productAdd.HarytGosmak'|_ }}</h5>
+                {% endif %}
+                <ol class="breadcrumb">
+                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">{{ 'breadcrumbEsasySahypa'|_ }}</a></li>
+                    {% if productForEditing %}
+                        <li class="breadcrumb-item active">{{ 'productAdd.HarytUytgetmek'|_ }}</li>
+                    {% else %}
+                        <li class="breadcrumb-item active">{{ 'productAdd.HarytGosmak'|_ }}</li>
+                    {% endif %}
+                </ol>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- Breadcumb Area -->
+
+<!-- addProducts Area -->
+<div class="bigshop_reg_log_area section_padding_100_50" id="mainDiv">
+    <div class="container">
+        <div class="row">
+            <div class="col-12 col-md-12">
+                <div class="login_form mb-50">
+                    <h5 class="mb-3">
+                    {% if productForEditing %}
+                        {{ 'productAdd.HarytUytgetmek'|_ }}
+                    {% else %}
+                        {{ 'productAdd.HarytGosmak'|_ }}
+                    {% endif %}
+                    </h5>
+
+                    {% if not productForEditing %}
+                        <div class="shortcodes_content">
+                            <form id="offerForm" action="#"
+                            data-request="onSave"
+                            data-request-flash
+                            data-request-validate
+                            data-request-files
+                            data-request-success="resetForm()"
+                            data-request-error="resetForm()"
+                            enctype="multipart/form-data">
+                            
+                            <div class="row">
+                                <div class="col-md-6 mb-3">
+                                    <label for="category">{{ 'productAdd.Kategoriya'|_ }}</label>
+                                    <select class="custom-select d-block w-100 form-control" id="category" data-belongsto="product" name="category_id" onChange="getCategories(this.value);" required>
+                                        <option value="" disabled>{{ 'productAdd.KategoriyaSayla'|_ }}</option>
+                                        {% for category in categories %}
+                                            <option value="{{ category.id }}" data-file="{{ category.is_file_category }}">{{ category.name }}</option>
+                                        {% endfor %}
+                                    </select>
+                                </div>
+                                <div class="col-md-6 mb-3">
+                                    <label for="subcategory">{{ 'productAdd.IkinjiKategoriya'|_ }}</label>
+                                    <select class="custom-select d-block w-100 form-control" id="subcategoryAdd" name="subcategory_id" disabled>
+                                        <option value=null>{{ 'productAdd.Subkategoriya'|_ }}</option>
+                                        
+                                    </select>
+                                </div>
+                                <div class="col-md-6 mb-3">
+                                    <label for="city">{{ 'productAdd.Welayat'|_ }}</label>
+                                    <select class="custom-select d-block w-100 form-control" id="city" name="state_id">
+                                        <option value=null disabled>{{ 'productAdd.WelayatSayla'|_ }}</option>
+                                        {% for state in states %}
+                                            <option value="{{ state.id }}">{{ state.name }}</option>
+                                        {% endfor %}
+                                    </select>
+                                </div>
+                                <div class="col-md-6 mb-3">
+                                    <label for="subCityAdd">{{ 'productAdd.Saher'|_ }}</label>
+                                    <select class="custom-select d-block w-100 form-control" id="subCityAdd" name="city_id" disabled>
+                                        <option value=null>{{ 'productAdd.SaherSayla'|_ }}</option>
+                                    </select>
+                                </div>
+                                
+                                <div class="col-md-6 mb-3">
+                                    <label for="name">{{ 'productAdd.HarydynAdy'|_ }}</label>
+                                    <input type="text" class="form-control" id="name" placeholder="{{ 'productAdd.HarydynAdy'|_ }}" name="name" required>
+                                </div>
+                                <div class="col-md-6 mb-3">
+                                    <label for="price">{{ 'productAdd.Bahasy'|_ }}</label>
+                                    <input type="number" class="form-control" id="price" name="price" min="0" required>
+                                </div>
+                                <div class="col-md-12 mb-3">
+                                    <label for="shortDescription">{{ 'productAdd.GysgaBeyany'|_ }}</label>
+                                    <textarea class="form-control" id="shortDescription" cols="30" name="short_description" rows="10" placeholder="{{ 'productAdd.GysgaBeyany'|_ }}" style="height: 160px;" required></textarea>
+                                </div>
+                                <div class="col-md-12 mb-3">
+                                    <label for="description">{{ 'productAdd.GinsileyinBeyany'|_ }}</label>
+                                    <textarea class="form-control" id="description" cols="30" rows="20" name="description" style="height: 160px;" placeholder="{{ 'productAdd.GinsileyinBeyany'|_ }}" required></textarea>
+                                </div>
+                                <div class="col-md-6 mb-3">
+                                    <label for="phone">{{ 'productAdd.TelefonBelgisi'|_ }}</label>
+                                    <input type="tel" class="form-control" id="phone" name="phone" value="+993" required>
+                                </div>
+                                <div class="col-md-6 mb-3">
+                                    <label for="stock">{{ 'productAdd.SkladdaBarmy'|_ }} ?</label>
+                                    <select class="custom-select d-block w-100 form-control" id="stock" name="stock">
+                                        <option value="1">{{ 'productAdd.ElimizdeBar'|_ }}</option>
+                                        <option value="0">{{ 'productAdd.ZakazaGelyar'|_ }}</option>
+                                    </select>
+                                </div>
+                                <div class="col-md-6 mb-3">
+                                    <label for="new_img">{{ 'productAdd.Suratlar'|_ }}</label>
+                                    <input type="file" class="form-control" id="new_img" name="new_img[]" multiple required>
+                                    <input type="hidden" value="0" name="is_file" id="isFile">
+                                </div>
+                                <div class="col-md-6 mb-3 d-none" id="newFileDiv">
+                                    <label for="new_file">{{ 'productAdd.FaylGosmak'|_ }}</label>
+                                    <input type="file" class="form-control" id="new_file" name="new_file" multiple>
+                                </div>
+                            </div>
+                            <input type="hidden" name="resetForm" id="resetForm" value="0"/>
+                            <button type="submit" class="btn btn-primary btn-sm mt-3">{{ 'productAdd.HarytGosmak'|_ }}</button>
+                        </form>
+                        </div>
+                    {% endif %}
+
+                    {% if productForEditing %}
+                        <div class="shortcodes_content">
+                            <form id="offerUpdateForm" action="#"
+                                data-request="onUpdate"
+                                data-request-flash
+                                data-request-validate
+                                data-request-files
+                                enctype="multipart/form-data">
+                                
+                                <div class="row">
+                                    <div class="col-md-6 mb-3">
+                                        <label for="categoryEdit">{{ 'productAdd.Kategoriya'|_ }}</label>
+                                        <select class="custom-select d-block w-100 form-control" id="categoryEdit" data-belongsto="product" name="category_id" onChange="getCategoriesForEdit(this.value);" required>
+                                             <option value="">{{ 'productAdd.KategoriyaSayla'|_ }}</option>
+                                            {% for category in categories %}
+                                                {% for prodCat in productForEditing.categories %}
+                                                    {% if prodCat.primary_key == 0 %}
+                                                        <option value="{{ category.id }}" {{ category.id == prodCat.id ? 'selected' : '' }} data-file="{{ category.is_file_category }}">{{ category.name }}</option>
+                                                    {% elseif prodCat.parent.parent %}
+                                                        <option value="{{ category.id }}" {{ category.id == prodCat.parent.parent.id ? 'selected' : '' }} data-file="{{ category.is_file_category }}">{{ category.name }}</option>
+                                                    {% else %}
+                                                        <option value="{{ category.id }}" {{ category.id == prodCat.parent.id ? 'selected' : '' }} data-file="{{ category.is_file_category }}">{{ category.name }}</option>
+                                                    {% endif %}
+                                                {% endfor %}
+                                            {% endfor %}
+                                        </select>
+                                    </div>
+                                    <div class="col-md-6 mb-3">
+                                        <label for="subcategoryEdit">{{ 'productAdd.IkinjiKategoriya'|_ }}</label>
+                                        
+                                        <select class="custom-select d-block w-100 form-control" id="subcategoryEdit" name="subcategory_id" required>
+                                        
+                                            {% for prodCat in productForEditing.categories %}
+                                                {% if prodCat.primary_key == 0 %}
+                                                    <option value=null disabled>Birinji dereje Sub-kategoriýa saýla</option>
+                                                {% else %}
+                                                    {% if prodCat.subs.count > 0 %}
+                                                        <option value="{{ prodCat.id }}" {{ productForEditing.categories.contains(prodCat.id) ? 'selected' : '' }} data-file="{{ prodCat.is_file_category }}">{{ prodCat.name }}</option>
+                                                        {% for sub in prodCat.subs %}
+                                                            <option value="{{ sub.id }}" {{ productForEditing.categories.contains(sub.id) ? 'selected' : '' }} data-file="{{ sub.is_file_category }}">{{ sub.name }}</option>
+                                                        {% endfor %}
+                                                    {% else %}
+                                                        {% set secondLevelCategory = prodCat.parent %}
+                                                        <option value="{{ secondLevelCategory.id }}" {{ productForEditing.categories.contains(secondLevelCategory.id) ? 'selected' : '' }} data-file="{{ secondLevelCategory.is_file_category }}">{{ secondLevelCategory.name }}</option>
+                                                        {% for thirdLevel in secondLevelCategory.subs %}
+                                                            <option value="{{ thirdLevel.id }}" {{ productForEditing.categories.contains(thirdLevel.id) ? 'selected' : '' }} data-file="{{ thirdLevel.is_file_category }}">{{ thirdLevel.name }}</option>
+                                                        {% endfor %}
+                                                    {% endif %}
+                                                {% endif %}
+                                            {% endfor %}
+                                            
+                                            
+                                        </select>
+                                    </div>
+                                    <div class="col-md-6 mb-3">
+                                        <label for="cityEdit">{{ 'productAdd.Welayat'|_ }}</label>
+                                        <select class="custom-select d-block w-100 form-control" id="cityEdit" name="state_id">
+                                            <option value=null>{{ 'productAdd.WelayatSayla'|_ }}</option>
+                                            {% for state in states %}
+                                                <option value="{{ state.id }}" {{ productForEditing.place_id == state.id ? 'selected' : '' }}>{{ state.name }}</option>
+                                            {% endfor %}
+                                        </select>
+                                    </div>
+                                    <div class="col-md-6 mb-3">
+                                        <label for="subCityEdit">{{ 'productAdd.Saher'|_ }}</label>
+                                        <select class="custom-select d-block w-100 form-control" id="subCityEdit" name="city_id">
+                                            <option value=null>{{ 'productAdd.SaherSayla'|_ }}</option>
+                                            {% for city in cities %}
+                                                <option value="{{ city.id }}" {{ productForEditing.place_id == city.id ? 'selected' : '' }}>{{ city.name }}</option>
+                                            {% endfor %}
+                                        </select>
+                                    </div>
+                                    
+                                    <div class="col-md-6 mb-3">
+                                        <label for="name">{{ 'productAdd.HarydynAdy'|_ }}</label>
+                                        <input type="text" class="form-control" id="name" placeholder="Harydyň ady" name="name" value="{{ productForEditing.name }}" required>
+                                    </div>
+                                    <div class="col-md-6 mb-3">
+                                        <label for="price">{{ 'productAdd.Bahasy'|_ }}</label>
+                                        <input type="number" class="form-control" id="price" name="price" min="0" value="{{ productForEditing.price }}" required>
+                                    </div>
+                                    <div class="col-md-12 mb-3">
+                                        <label for="shortDescription">{{ 'productAdd.GysgaBeyany'|_ }}</label>
+                                        <textarea class="form-control" id="shortDescription" cols="30" name="short_description" rows="10" placeholder="{{ 'productAdd.GysgaBeyany'|_ }}" style="height: 160px;" required>{{ productForEditing.short_description }}</textarea>
+                                    </div>
+                                    <div class="col-md-12 mb-3">
+                                        <label for="description">{{ 'productAdd.GinsileyinBeyany'|_ }}</label>
+                                        <textarea class="form-control" id="description" cols="30" rows="20" name="description" style="height: 160px;" placeholder="{{ 'productAdd.GinsileyinBeyany'|_ }}" required>{{ productForEditing.description|striptags|raw  }}</textarea>
+                                    </div>
+                                    
+                                    <div class="col-md-6 mb-3">
+                                        <label for="phone">{{ 'productAdd.TelefonBelgisi'|_ }}</label>
+                                        <input type="tel" class="form-control" id="phone" name="phone" value="{{ productForEditing.phone ? productForEditing.phone : '+993' }}" required>
+                                    </div>
+                                    <div class="col-md-6 mb-3">
+                                        <label for="stock">{{ 'productAdd.SkladdaBarmy'|_ }} ?</label>
+                                        <select class="custom-select d-block w-100 form-control" id="stock" name="stock">
+                                            <option value="1" {{ productForEditing.stock == 1 ? 'selected': '' }}>{{ 'productAdd.ElimizdeBar'|_ }}</option>
+                                            <option value="0" {{ productForEditing.stock == 0 ? 'selected': '' }}>{{ 'productAdd.ZakazaGelyar'|_ }}</option>
+                                        </select>
+                                    </div>
+                                    <div class="col-md-6 mb-3">
+                                        <label for="new_img">{{ 'productAdd.Suratlar'|_ }}</label>
+                                        <input type="file" class="form-control" id="new_img" name="new_img[]" multiple>
+                                        <input type="hidden" value="0" name="is_file" id="isFile">
+                                    </div>
+                                    <div class="col-md-6 mb-3 d-none" id="newFileDiv">
+                                        <label for="new_file">{{ 'productAdd.FaylGosmak'|_ }}</label>
+                                        <input type="file" class="form-control" id="new_file" name="new_file" multiple>
+                                    </div>
+                                    
+                                    <div class="col-12">
+                                         <!-- Shortcodes Title -->
+                                        <div class="shortcodes_title mb-30 mt-5">
+                                            <h5>{{ 'productAdd.OnkiSuratlar'|_ }}</h5>
+                                        </div>
+                            
+                                        <!-- Gallery Area -->
+                                       
+                                        {% for key, image in productForEditing.images %}
+                                            <div class="col-9 col-sm-12 col-md-6 col-lg-4" id="image-{{ key }}">
+                                                <div class="single-product-area mb-30">
+                                                    <div class="product_image">
+                                                        <!-- Product Image -->
+                                                        <img class="normal_img" src="{{ image.path }}" alt="Gurluşyk, Gurluşyk platform, bezeg gurluşyk, gipsler merkezi">
+                                                
+                                                    </div>
+                                                    <div class="product_description">
+                                                        <div class="product_add_to_cart">
+                                                            <a href="#"
+                                                                 data-request="onImageDelete"
+                                                                 data-request-data="product_id: {{ productForEditing.id }}, product_image_id: {{ image.id }}"
+                                                                 data-request-flash
+                                                            style="width:100%; background-color:red;"><i class="icofont-trash"></i> Pozmak</a>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        {% endfor %}
+                                    </div>
+                                    
+                                    
+                                    
+                                </div>
+                                <input type="hidden" name="resetForm" id="resetForm" value="0"/>
+                                <input type="hidden" name="product_id" value="{{ productForEditing.id }}"/>
+                                <button type="submit" class="btn btn-primary btn-sm mt-3">{{ 'productAdd.Uytgetmek'|_ }}</button>
+                            </form>
+                        </div>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+{% put scripts %}
+
+<script>
+function getCategories(catId) {
+    $.request('onGetCategorySubs', {
+    data: {'mainCat': catId},
+    success: function(data) {
+             if(data.length > 0){
+                 $('#subcategoryAdd').prop("disabled", false);
+                 $('#subcategoryAdd').html(`<option value=null>Subkategoriýa saýla</option>`);
+                 for (var sub of data) {
+                     $('#subcategoryAdd').append(`<option value="`+sub.id+`">`+sub.name+`</option>`);
+                 }
+             }else{
+                 $('#subcategoryAdd').prop("disabled", true);
+             }
+        }
+    });   
+}
+        
+function getCategoriesForEdit(catId) {
+    console.log(catId);
+    $.request('onGetCategorySubs', {
+    data: {'mainCat': catId},
+    success: function(data) {
+             if(data.length > 0){
+                 $('#subcategoryEdit').prop("disabled", false);
+                 $('#subcategoryEdit').html(`<option value=null>Subkategoriýa saýla</option>`);
+                 for (var sub of data) {
+                     $('#subcategoryEdit').append(`<option value="`+sub.id+`">`+sub.name+`</option>`);
+                 }
+             }else{
+                 $('#subcategoryEdit').prop("disabled", true);
+             }  
+        }
+    });   
+}
+</script>
+
+
+<script>
+    function resetForm() {
+        document.getElementById('offerForm').reset(); // Reset the form
+    }
+</script>
+<script>
+$(document).ready(function() {
+    
+    
+    $('input[name*="phone"]').inputmask("+99399999999");
+    $("#category").on("change", function() {
+      var selectedValue = $(this).val();
+      var isFile = $(this).find(':selected').data('file');
+      if (isFile > 0){
+        $("#isFile").val(1);
+        $("#newFileDiv").removeClass("d-none");
+        $("#new_file").attr("required", "true");
+      }else{
+        $("#isFile").val(0);
+        $("#new_file").removeAttr("required");
+        $("#newFileDiv").addClass("d-none");
+      }
+    });
+    
+    $("#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-file="'+data[i]['is_file_category']+'">'+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 %}

themes/gurlushyk/pages/contact-us.htm

@@ -2,7 +2,94 @@ title = "contact-us"
 url = "/contact-us"
 layout = "default"
 is_hidden = 0
+robot_index = "index"
+robot_follow = "follow"
 
-[contactForm]
+[genericForm]
+group = "Contact Us"
+messages_success = "success.sent"
+messages_errors = "error.sent"
+mail_enabled = 1
+mail_subject = "Gurlushyk Web Site"
+mail_recipients[] = "annamyradowshohrat@gmail.com"
+reset_form = 1
+inline_errors = "disabled"
+js_on_success = "alert(\"Hatynyz Ustunlikli ugradyldy yakyn wagtda siz bilen habarlasharys\");"
+js_on_error = "alert(\"Tehniki nasazlyk yuze cykdy\");"
+sanitize_data = "disabled"
+anonymize_ip = "disabled"
+recaptcha_theme = "light"
+recaptcha_type = "image"
+recaptcha_size = "normal"
+emails_date_format = "Y-m-d"
 ==
-{% component 'contactForm' %}
+<!-- Breadcumb Area -->
+<div class="breadcumb_area">
+    <div class="container h-100">
+        <div class="row h-100 align-items-center">
+            <div class="col-12">
+                <h5>{{ 'breadcrumbHabarlasmak'|_ }}</h5>
+                <ol class="breadcrumb">
+                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">{{ 'breadcrumbEsasySahypa'|_ }}</a></li>
+                    <li class="breadcrumb-item active">{{ 'breadcrumbHabarlasmak'|_ }}</li>
+                </ol>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- Breadcumb Area -->
+
+<!-- addProducts Area -->
+<div class="bigshop_reg_log_area section_padding_100_50">
+    <div class="container">
+        <div class="row">
+            <div class="col-12 col-md-12">
+                <div class="login_form mb-50">
+                    <h5 class="mb-3">{{ 'breadcrumbHabarlasmak'|_ }}</h5>
+                    <div class="shortcodes_content">
+                        <form data-request="{{ genericForm }}::onFormSubmit" class="contact_form"  data-request-validate data-request-flash >
+                         
+                            {{ form_token() }}
+                            <div id="genericForm_forms_flash" style="color: darkgreen;font-weight: 600;"></div>
+                            <div class="row">
+                                <div class="col-md-6 mb-3">
+                                    <label for="name">{{ 'contactAdy'|_ }}</label>
+                                    <input type="text" class="form-control" id="name" placeholder="{{ 'contactAdy'|_ }}" name="name" required>
+                                </div>
+                                <div class="col-md-6 mb-3">
+                                    <label for="price">{{ 'contactFamiliyasy'|_ }}</label>
+                                    <input type="text" class="form-control" id="price" name="surname" min="0" placeholder="{{ 'contactFamiliyasy'|_ }}" required>
+                                </div>
+                                <div class="col-md-6 mb-3">
+                                    <label for="phone">{{ 'contactTelefon'|_ }}</label>
+                                    <span style="position:relative;top: 41px;left: -43px;font-size: 13px;">+993</span>
+                                    <input type="number" class="form-control" min="61000000" max="65999999" id="mobile" name="mobile" style="padding-left: 52px;" placeholder="{{ 'inputPlaceholder.TelefonBelgi'|_ }}" required>
+                                </div>
+                              <!--   <div class="col-md-6 mb-3">
+                                  <label for="email">{{ 'contactEmail'|_ }}</label>
+                                  <input type="email" class="form-control" id="email" name="email" placeholder="{{ 'contactEmail'|_ }}" required>
+                              </div> -->
+                                
+                                <div class="col-md-12 mb-3">
+                                    <label for="order-notes">{{ 'contactHat'|_ }}</label>
+                                    <textarea class="form-control" id="content" cols="30" name="content" placeholder="{{ 'contactHat'|_ }}" style="height: 200px;"></textarea>
+                                </div>
+                                
+                            </div>
+                            <button type="submit" class="btn btn-primary btn-sm mt-3">{{ 'contactUgratmak'|_ }}</button>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+{% put scripts %}
+<script>
+    function resetForm() {
+        document.getElementById('offerForm').reset(); // Reset the form
+        document.getElementById('offerUpdateForm').reset();
+    }
+</script>
+{% endput %}

themes/gurlushyk/pages/haryt2.htm

@@ -56,13 +56,13 @@ security = "all"
                             <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: {{ product.vendor.work_time }} <span class="text-muted"></span></label>
+                                    <label style="font-weight: 300;margin-bottom: 0px;">- {{ 'profileIsWagty'|_ }}: {{ product.vendor.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 {{ product.vendor.username }} <span class="text-muted"></span></label>
+                                    <label style="font-weight: 300;margin-bottom: 0px;">- {{ 'profileTelefon'|_ }}: +993 {{ product.vendor.username }} <span class="text-muted"></span></label>
                                 </p>
                                <a href="/user-profile/{{product.vendor.id}}" type="button" class="btn btn-primary" style="width: 100%;margin-top: 20px;">
-                                   Doly Maglumat
+                                   {{ 'parallaxDolyMaglumat'|_ }}
                                 </a>
                             </div>
                         </div>

themes/gurlushyk/pages/index.htm

@@ -167,6 +167,6 @@ offerId = "{{ :id }}"
 
 
 
-{% partial "home/vip-section" type="vip" header="home.prod.section1"|_ %}
+{% partial "home/vip-section" type="vip" header="home.VipHarytlar"|_ %}
 {% partial "home/parallax" %}
-{% partial "home/vip-section" type="new" header="Täze Harytlar" %}
+{% partial "home/vip-section" type="new" header="home.TazeHarytlar"|_ %}

themes/gurlushyk/pages/login.htm

@@ -3,6 +3,8 @@ url = "/login"
 layout = "default"
 description = "Login page"
 is_hidden = 0
+robot_index = "index"
+robot_follow = "follow"
 
 [account]
 redirect = "index"
@@ -15,10 +17,10 @@ requirePassword = 0
         <div class="container h-100">
             <div class="row h-100 align-items-center">
                 <div class="col-12">
-                    <h5>Içeri girmek</h5>
+                    <h5>{{ 'header.IceriGirmek'|_ }}</h5>
                     <ol class="breadcrumb">
-                        <li class="breadcrumb-item"><a href="{{ 'index'|page }}">Esasy sahypa</a></li>
+                        <li class="breadcrumb-item"><a href="{{ 'index'|page }}">{{ 'breadcrumbEsasySahypa'|_ }}</a></li>
-                        <li class="breadcrumb-item active">Içeri girmek</li>
+                        <li class="breadcrumb-item active">{{ 'header.IceriGirmek'|_ }}</li>
                     </ol>
                 </div>
             </div>
@@ -33,26 +35,27 @@ requirePassword = 0
             <div class="row">
                 <div class="col-12 col-md-12">
                     <div class="login_form mb-50">
-                        <h5 class="mb-3">Login</h5>
+                        <h5 class="mb-3">{{ 'header.IceriGirmek'|_ }}</h5>
                         {{ form_ajax('onSignin') }}
                             <div class="form-group">
-                                <input type="text" name="login" class="form-control" id="userSigninLogin" placeholder="Telefon belgi">
+                                <span style="position:relative;top: 33px;left: 18px;font-size: 13px;">+993</span>
+                                <input type="number" name="login" class="form-control" min="61000000" max="65999999" id="userSigninLogin"  placeholder="{{ 'inputPlaceholder.TelefonBelgi'|_ }}" style="padding-left: 52px;">
                             </div>
                             <div class="form-group">
-                                <input type="password" name="password" class="form-control" id="userSigninPassword" placeholder="Açar söz">
+                                <input type="password" name="password" class="form-control" id="userSigninPassword" placeholder="{{ 'inputPlaceholder.AcarSoz'|_ }}">
                             </div>
                             {% if rememberLoginMode == 'ask' %}
                                 <div class="form-check">
                                     <div class="custom-control custom-checkbox mb-3 pl-1">
                                         <input type="checkbox" class="custom-control-input" id="customChe">
-                                        <label class="custom-control-label" for="customChe">Meni ýatda sakla</label>
+                                        <label class="custom-control-label" for="customChe">{{ 'formMeniYatdaSakla'|_ }}</label>
                                     </div>
                                 </div>
                             {% endif %}
-                            <button type="submit" class="btn btn-primary btn-sm">Içeri girmek</button>
+                            <button type="submit" class="btn btn-primary btn-sm">{{ 'header.IceriGirmek'|_ }}</button>
                         {{ form_close() }}
                         <div class="forget_pass mt-15">
-                            Öň hasabyňyz ýokmy? <a href="{{ 'register'|page }}">Agza bolmak</a>
+                            {{ 'auth.OnHasabynyzYokmy'|_ }} <a href="{{ 'register'|page }}">{{ 'auth.AgzaBolmak'|_ }}</a>
                         </div>
                     </div>
                 </div>

themes/gurlushyk/pages/my-offers.htm

@@ -2,6 +2,12 @@ title = "Harytlarym"
 url = "/my-offers"
 layout = "default"
 is_hidden = 0
+robot_index = "index"
+robot_follow = "follow"
+
+[session]
+security = "user"
+redirect = "login"
 
 [myOffers]
 perPage = 12

themes/gurlushyk/pages/my-orders.htm

@@ -2,8 +2,14 @@ title = "Zakazlarym"
 url = "/my-orders"
 layout = "default"
 is_hidden = 0
+robot_index = "index"
+robot_follow = "follow"
 
 [myorders]
 perPage = 12
+
+[session]
+security = "user"
+redirect = "login"
 ==
 {% component 'myorders' %}

themes/gurlushyk/pages/order-cancel.htm

@@ -2,26 +2,13 @@ title = "Zakazy ýatyrmak"
 url = "/order-cancel"
 layout = "default"
 is_hidden = 0
+robot_index = "index"
+robot_follow = "follow"
 ==
 <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>
+        {% content 'orderCancel' %}
-        <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/print.htm

@@ -0,0 +1,140 @@
+title = "Print"
+url = "/print/:id"
+is_hidden = 0
+robot_index = "index"
+robot_follow = "follow"
+
+[singlesale]
+id = "{{ :id }}"
+perPage = 12
+
+[session]
+security = "user"
+redirect = "login"
+==
+{% set sales = singlesale.sales %}
+{% set order = singlesale.order %}
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta http-equiv="X-UA-Compatible" content="ie=edge">
+        <title>Zakaz # {{ order.id }} | gurlushyk.com.tm</title>
+
+        <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700"/>
+        <link rel="icon" href="{{ 'assets/img/core-img/favicon.png'|theme}}">
+        <link rel="stylesheet" href="{{ 'assets/css/style.css'|theme}}">
+        <link rel="stylesheet" href="{{ 'assets/css/newcss.css'|theme}}">
+        <link rel="stylesheet" href="{{ 'assets/css/toastr.min.css'|theme}}">
+        
+        <style>
+            @media print {
+              .backgroundOrange {
+                 background-color: orange;
+              }
+            }
+        
+        </style>
+            
+            
+    </head>
+    
+        <body onload="window.print();">
+           <div class="container">
+               <!-- Checkout Area -->
+                <div class="checkout_area section_padding_100">
+                    <div class="container">
+                        <div class="row">
+                            <div class="col-12">
+                                <div class="checkout_details_area clearfix">
+                                    <div class="cart-table">
+                                        <div class="table-responsive">
+                                            <table class="table table-bordered mb-30 backgroundOrange">
+                                                <thead>
+                                                    <tr>
+                                                        
+                                                        <th scope="col">{{ 'checkout.HarytAdy'|_ }}</th>
+                                                        <th scope="col">{{ 'checkout.Bahasy'|_ }}</th>
+                                                        <th scope="col">{{ 'checkout.Mukdary'|_ }}</th>
+                                                        <th scope="col">{{ 'checkout.Umumy'|_ }}</th>
+                                                    </tr>
+                                                </thead>
+                                                <tbody>
+                                                    {% set total_price = 0 %}
+                                                    {% for saleOrder in sales %}
+                                                    <tr>
+                                                        
+                                                        <td>{{ saleOrder.product.name }}</td>
+                                                        <td>{{ saleOrder.product.price }} TMT</td>
+                                                        <td>{{ saleOrder.qty }}</td>
+                                                        <td>{{ saleOrder.product.price * saleOrder.qty }} TMT</td>
+                                                        {% set total_price = total_price + (saleOrder.product.price * saleOrder.qty) %}
+                                                    </tr>
+                                                    {% endfor %}
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            
+                        </div>
+                        
+                        <div class="row">
+                                <div class="col-6">
+                                    <div class="cart-total-area">
+                                        <h5 class="mb-3">{{ 'checkout.BeylekiMaglumatlar'|_ }}</h5>
+                                        
+                                        <div class="table-responsive">
+                                            <table class="table mb-0">
+                                                <tbody>
+                                                    <tr>
+                                                        <td>{{ 'checkout.Ulanyjy'|_ }}</td>
+                                                        <td>{{ order.user.name }}</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>{{ 'footer.TelefonTitle'|_ }}</td>
+                                                        <td>+993 {{ order.user.username }}</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>{{ 'checkout.Address'|_ }}</td>
+                                                        <td>{{ order.address }}</td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td>{{ 'checkout.Bellik'|_ }}</td>
+                                                        <td>{{ order.note }}</td>
+                                                    </tr>
+                                                    
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    </div>
+                                </div>
+                
+                                <div class="col-6">
+                                
+                                    <div class="cart-total-area">
+                                        <h5 class="mb-3">{{ 'checkout.Jemi'|_ }}</h5>
+                                        <div class="table-responsive">
+                                            <table class="table mb-0">
+                                                <tbody>
+                                                    <tr>
+                                                        <td>{{ 'checkout.Jemi'|_ }}</td>
+                                                        <td>{{ total_price }} TMT</td>
+                                                    </tr>
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                
+                                    </div>
+                                </div>
+                            </div>
+                        
+                        
+                    </div>
+                </div>
+                <!-- Checkout Area End -->
+           </div>
+        </body>
+</html>

themes/gurlushyk/pages/privacy.htm

@@ -2,9 +2,19 @@ title = "privacy"
 url = "/privacy"
 layout = "default"
 is_hidden = 0
+robot_index = "index"
+robot_follow = "follow"
 ==
 <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><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 class="ty-mainbox-container clearfix">
+        <div class="ty-mainbox-body">
+            <div class="ty-wysiwyg-content">
+                <div>
+                    {% content 'privacy' %}
+                </div>
+            </div>
+        </div>
+    </div>
 
 </div>

themes/gurlushyk/pages/register.htm

@@ -2,6 +2,8 @@ title = "Agza bolmak"
 url = "/register"
 layout = "default"
 is_hidden = 0
+robot_index = "index"
+robot_follow = "follow"
 
 [account]
 redirect = "index"
@@ -13,10 +15,10 @@ requirePassword = 0
     <div class="container h-100">
         <div class="row h-100 align-items-center">
             <div class="col-12">
-                <h5>Agza bolmak</h5>
+                <h5>{{ 'auth.AgzaBolmak'|_ }}</h5>
                 <ol class="breadcrumb">
-                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">Esasy sahypa</a></li>
+                    <li class="breadcrumb-item"><a href="{{ 'index'|page }}">{{ 'breadcrumbEsasySahypa'|_ }}</a></li>
-                    <li class="breadcrumb-item active">Agza bolmak</li>
+                    <li class="breadcrumb-item active">{{ 'auth.AgzaBolmak'|_ }}</li>
                 </ol>
             </div>
         </div>
@@ -31,25 +33,26 @@ requirePassword = 0
                 <div class="row">
                     <div class="col-12 col-md-12">
                         <div class="login_form mb-50">
-                            <h5 class="mb-3">Agza bolmak</h5>
+                            <h5 class="mb-3">{{ 'auth.AgzaBolmak'|_ }}</h5>
                             {{ form_ajax('onRegister') }}
                                 <div class="form-group">
-                                    <input type="text" class="form-control" name="name" id="registerName" placeholder="Ulanyjy">
+                                    <input type="text" class="form-control" name="name" id="registerName" placeholder="{{ 'inputPlaceholder.Ulanyjy'|_ }}">
                                 </div>
                                 <div class="form-group">
-                                    <input type="text" class="form-control" name="username" id="registerEmail" placeholder="Telefon belgi">
+                                <span style="position:relative;top: 33px;left: 18px;font-size: 13px;">+993</span>
-                                    <input type="hidden" class="form-control" name="email" id="registerUsername" value="Ulanyjy">
+                                    <input type="number" class="form-control" name="username" min="61000000" max="65999999" id="registerEmail" placeholder="{{ 'inputPlaceholder.TelefonBelgi'|_ }}" style="padding-left: 52px;">
+                                    <input type="hidden" name="email" value="">
                                 </div>
                                 <div class="form-group">
-                                    <input type="password" class="form-control" name="password" id="registerPassword" placeholder="Açar söz">
+                                    <input type="password" class="form-control" name="password" id="registerPassword" placeholder="{{ 'inputPlaceholder.AcarSoz'|_ }}">
                                 </div>
                                 <div class="form-group">
-                                    <input type="password" class="form-control" name="password_confirmation" id="registerPasswordConfirmation" placeholder="Açar söz gaýtala">
+                                    <input type="password" class="form-control" name="password_confirmation" id="registerPasswordConfirmation" placeholder="{{ 'inputPlaceholder.AcarSozGaytala'|_ }}">
                                 </div>
-                                <button type="submit" class="btn btn-primary btn-sm">Agza bolmak</button>
+                                <button type="submit" class="btn btn-primary btn-sm">{{ 'auth.AgzaBolmak'|_ }}</button>
                             {{ form_close() }}
                             <div class="forget_pass mt-15">
-                                Öň hasabyňyz barmy? <a href="{{ 'login'|page }}">Içeri girmek</a>
+                                {{ 'auth.OnHasabynyzBarmy'|_ }} <a href="{{ 'login'|page }}">{{ 'header.IceriGirmek'|_ }}</a>
                             </div>
                         </div>
                     </div>

themes/gurlushyk/pages/return.htm

@@ -2,26 +2,13 @@ title = "Harydy yzyna gaýtarmak"
 url = "/return"
 layout = "default"
 is_hidden = 0
+robot_index = "index"
+robot_follow = "follow"
 ==
 <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>
+        {% content 'refund' %}
-        <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-page.htm

@@ -0,0 +1,7 @@
+title = "Ulanyjy Profil"
+url = "/user"
+layout = "default"
+is_hidden = 0
+robot_index = "index"
+robot_follow = "follow"
+==

themes/gurlushyk/pages/vendor-settings.htm

@@ -2,7 +2,13 @@ title = "Dükanyň sazlamalary"
 url = "/vendor-settings"
 layout = "default"
 is_hidden = 0
+robot_index = "index"
+robot_follow = "follow"
 
 [shopsettings]
+
+[session]
+security = "user"
+redirect = "login"
 ==
 {% component 'shopsettings' %}

themes/gurlushyk/partials/footer.htm

@@ -5,7 +5,7 @@
             <div class="row">
                 <!-- Single Feature Area -->
                 <div class="col-12 col-sm-12 col-lg-12" >
-                    <p style="text-align: center;font-weight: bold;color: #f8f8ff;background: #1d2536;padding: 6px;border-radius: 5px;">{{'layout.footer.7.24'|_}}</p>
+                    <p style="text-align: center;font-weight: bold;color: #f8f8ff;background: #1d2536;padding: 6px;border-radius: 5px;">{{'content.7/24'|_}}</p>
                 </div>
             </div>
         </div>
@@ -17,12 +17,12 @@
             <div class="col-6 col-sm-6 col-md-5 col-lg-4 col-xl-3">
                 <div class="single_footer_area mb-100">
                     <div class="footer_heading mb-4">
-                        <h6>Biziň bilen habarlaşmak</h6>
+                        <h6>{{ 'footer.Habarlasmak'|_ }}</h6>
                     </div>
                     <ul class="footer_content">
-                        <li><span>Salgy:</span> Bitarap Türkmenistan şaýoly</li>
+                        <li><span>{{ 'footer.SalgyTitle'|_ }}:</span> {{ 'footer.Salgy'|_ }}</li>
-                        <li><span>Telefon:</span> 99365809786</li>
+                        <li><span>{{ 'footer.TelefonTitle'|_ }}:</span> {{ 'footer.Telefon'|_ }}</li>
-                        <li><span>Email:</span> gurlushyk@example.com</li>
+                        <li><span>{{ 'footer.EmailTitle'|_ }}:</span> {{ 'footer.Email'|_ }}</li>
                     </ul>
                     <div class="footer_social_area mt-15">
                         <a href="#"><i class="fa fa-facebook" aria-hidden="true"></i></a>
@@ -36,15 +36,15 @@
             <div class="col-6 col-sm-6 col-md col-lg-4 col-xl-2">
                 <div class="single_footer_area mb-100">
                     <div class="footer_heading mb-4">
-                        <h6>Sahypalar</h6>
+                        <h6>{{ 'footer.Sahypalar'|_ }}</h6>
                     </div>
                     <ul class="footer_widget_menu">
                         {% if user %}
-                            <li><a href="{{ 'vendor-settings'|page }}"><i class="icofont-rounded-right"></i> Dükanyň sazlamalary</a></li>
+                            <li><a href="{{ 'vendor-settings'|page }}"><i class="icofont-rounded-right"></i> {{ 'profileDropdown.DukanSazlamalary'|_ }}</a></li>
-                            <li><a href="{{ 'wishlist'|page }}"><i class="icofont-rounded-right"></i> Halanlarym</a></li>
+                            <li><a href="{{ 'wishlist'|page }}"><i class="icofont-rounded-right"></i> {{ 'footer.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> {{ 'profileDropdown.DukanSazlamalary'|_ }}</a></li>
-                            <li><a href="{{ 'login'|page }}"><i class="icofont-rounded-right"></i> Halanlarym</a></li>
+                            <li><a href="{{ 'login'|page }}"><i class="icofont-rounded-right"></i> {{ 'footer.Halanlarym'|_ }}</a></li>
                         {% endif %}
                     </ul>
                 </div>
@@ -54,11 +54,11 @@
             <div class="col-6 col-sm-6 col-md col-lg-4 col-xl-2">
                 <div class="single_footer_area mb-100">
                     <div class="footer_heading mb-4">
-                        <h6>Sahypalar</h6>
+                        <h6>{{ 'footer.Sahypalar'|_ }}</h6>
                     </div>
                     <ul class="footer_widget_menu">
-                        <li><a href="{{ 'checkout'|page }}"><i class="icofont-rounded-right"></i> Sebedim</a></li>
+                        <li><a href="{{ 'checkout'|page }}"><i class="icofont-rounded-right"></i> {{ 'footer.Sebedim'|_ }}</a></li>
-                        <li><a href="{{ 'return'|page }}"><i class="icofont-rounded-right"></i> Yzyna gaýtarmak</a></li>
+                        <li><a href="{{ 'return'|page }}"><i class="icofont-rounded-right"></i> {{ 'footer.YzynaGaytarmak'|_ }}</a></li>
                     </ul>
                 </div>
             </div>
@@ -67,11 +67,11 @@
             <div class="col-6 col-sm-6 col-md-5 col-lg-4 col-xl-2">
                 <div class="single_footer_area mb-100">
                     <div class="footer_heading mb-4">
-                        <h6>Sahypalar</h6>
+                        <h6>{{ 'footer.Sahypalar'|_ }}</h6>
                     </div>
                     <ul class="footer_widget_menu">
-                        <li><a href="{{ 'order-cancel'|page }}"><i class="icofont-rounded-right"></i> Zakazy ýatyrmak</a></li>
+                        <li><a href="{{ 'order-cancel'|page }}"><i class="icofont-rounded-right"></i> {{ 'footer.ZakazyYatyrmak'|_ }}</a></li>
-                        <li><a href="{{ 'contact'|page }}"><i class="icofont-rounded-right"></i> Habarlaşmak</a></li>
+                        <li><a href="{{ 'contact-us'|page }}"><i class="icofont-rounded-right"></i> {{ 'footer.Habarlasmak'|_ }}</a></li>
                     </ul>
                 </div>
             </div>
@@ -80,7 +80,7 @@
             <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 programmalarymyz</h6>
+                        <h6>{{ 'footer.MobilProgrammalarymyz'|_ }}</h6>
                     </div>
                     <div class="apps_download">
                         <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>
@@ -98,7 +98,7 @@
                 <!-- Copywrite -->
                 <div class="col-12 col-md-6">
                     <div class="copywrite_text">
-                        <p>Ähli hukuklary goralan</p>
+                        <p>{{ 'footer.HukuklarGoralan'|_ }}</p>
                     </div>
                 </div>
                 <!-- Payment Method -->

themes/gurlushyk/partials/header.htm

@@ -44,11 +44,11 @@ pageNumber = "{{ :page }}"
 
             {% if user %}
                 <li>
-                    <a href="{{ 'addProduct'|page }}">{{ 'header.addProduct'|_ }}</a>
+                    <a href="{{ 'addProduct'|page }}">{{ 'header.HarytGosmak'|_ }}</a>
                 </li>
                 <li>
                     <a class="customA" data-request="onLogout" data-request-data="redirect: '/'" role="button">
-                        {{ 'header.logout'|_ }}
+                        {{ 'header.Cykmak'|_ }}
                     </a>
                 </li>
             {% endif %}
@@ -56,12 +56,12 @@ pageNumber = "{{ :page }}"
             {% if not user %}
                 <li>
                     <a href="{{ 'login'|page }}">
-                        Haryt goşmak
+                        {{ 'header.HarytGosmak'|_ }}
                     </a>
                 </li>
                 <li>
                     <a href="{{ 'login'|page }}">
-                        Içeri girmek
+                        {{ 'header.IceriGirmek'|_ }}
                     </a>
                 </li>
             {% endif %}
@@ -72,11 +72,11 @@ pageNumber = "{{ :page }}"
                         {{activeLocaleName}}
                     </a>
                     <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu1">
-    
+                        
                         {% for code, name in locales %}
                             {% if code != activeLocale %}
     
-                            <a class="dropdown-item"  href="{{ url('/' ~ code) }}">
+                            <a class="dropdown-item" href="#" data-request="onSwitchLocale" data-request-data="locale: '{{code}}'">
                                 {{name }}
                             </a>
                             {% endif %}
@@ -102,13 +102,13 @@ pageNumber = "{{ :page }}"
                 <!-- Search -->
                 <div class="header_box-search-input">
                     <form action="{{ 'search'|page }}" method="GET">
-                        <input class="searchGurl" type="search" name="name" placeholder="Gözleg">
+                        <input class="searchGurl" type="search" name="name" placeholder="{{ 'header.Gozleg'|_ }}">
                         <button type="button">
                             <svg fill="#f27a1a" width="24px" height="24px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                                 <path d="M21.71,20.29,18,16.61A9,9,0,1,0,16.61,18l3.68,3.68a1,1,0,0,0,1.42,0A1,1,0,0,0,21.71,20.29ZM11,18a7,7,0,1,1,7-7A7,7,0,0,1,11,18Z"></path>
                             </svg>
                         </button>
-                        <input type="submit" class="d-none" value="Gözlemek">
+                        <input type="submit" class="d-none" value="{{ 'header.Gozleg'|_ }}">
                     </form>
                 </div>
                 <!-- Hero Meta -->
@@ -139,18 +139,18 @@ pageNumber = "{{ :page }}"
                         </div>
                         {% if user %}
                             <ul class="user-meta-dropdown">
-                                <li class="user-title"><span>Salam,</span> {{ user.name }}</li>
+                                <li class="user-title"><span>{{ 'profileDropdown.Salam'|_ }},</span> {{ user.name }}</li>
-                                <li><a href="{{ 'my-offers'|page }}">Harytlarym</a></li>
+                                <li><a href="{{ 'my-offers'|page }}">{{ 'profileDropdown.Harytlarym'|_ }}</a></li>
-                                <li><a href="{{ 'chat'|page }}">Hatlarym 
+                                <li><a href="{{ 'chat'|page }}">{{ 'profileDropdown.Hatlarym'|_ }} 
                                 
                                 {% if user.getUnreadMessagesCount() > 0 %}
                                     <span class="badge badge-pill badge-primary" style="font-size: 10px;background: #f37b1c;">{{ user.getUnreadMessagesCount() }}</span></a></li>
                                 {% endif %}
                                 
-                                <li><a href="{{ 'my-orders'|page }}">Zakazlarym</a></li>
+                                <li><a href="{{ 'my-orders'|page }}">{{ 'profileDropdown.Zakazlarym'|_ }}</a></li>
-                                <li><a href="{{ 'vendor-settings'|page }}">Dükanyň sazlamalary</a></li>
+                                <li><a href="{{ 'vendor-settings'|page }}">{{ 'profileDropdown.DukanSazlamalary'|_ }}</a></li>
-                                <li><a href="{{ 'my-comments'|page }}">Teswirler</a></li>
+                                <li><a href="{{ 'my-comments'|page }}">{{ 'profileDropdown.Kammentarialar'|_ }}</a></li>
-                                <li><a href="{{ 'vendor-sales'|page }}">Gelen sargytlar</a></li>
+                                <li><a href="{{ 'vendor-sales'|page }}">{{ 'profileDropdown.GelenSargytlar'|_ }}</a></li>
                             </ul>
                         {% endif %}
                     </div>
@@ -239,8 +239,8 @@ pageNumber = "{{ :page }}"
                             </ul>
                         </div>
                         <form  action="{{ 'search'|page }}" method="GET" class="header_box-search-input burger">
-                            <input type="search" name="name" placeholder="Gözleg">
+                            <input type="search" name="name" placeholder="{{ 'header.Gozleg'|_ }}">
-                            <input type="submit" class="d-none" value="Gözlemek">
+                            <input type="submit" class="d-none" value="{{ 'header.Gozleg'|_ }}">
                             <button type="button">
                                 <svg fill=" #f27a1a" width="24px" height="24px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                                     <path d="M21.71,20.29,18,16.61A9,9,0,1,0,16.61,18l3.68,3.68a1,1,0,0,0,1.42,0A1,1,0,0,0,21.71,20.29ZM11,18a7,7,0,1,1,7-7A7,7,0,0,1,11,18Z"></path>

themes/gurlushyk/partials/home/parallax.htm

@@ -5,9 +5,9 @@
             <div class="row">
                 <div class="col-12">
                     <div class="weekly_deals_content text-center">
-                        <h3>Gipsler Merkezi</h3>
+                        <h3>{{ 'parallaxEsasyKiciTekst'|_ }}</h3>
-                        <p>Dünýä standartlaryna laýyklykda, ýokary hilli gipsler.<br> Hormatly müşderiler siz öz islegleriňize görä islendik gipsleri sargyt edip bilersiňiz.</p>
+                        <p>{{ 'parallaxEsasyUlyTekst'|_ }}</p>
-                        <a href="/user-profile/18" class="btn btn-primary" style="animation-delay: 600ms; opacity: 1;">KATALOG</a>
+                        <a href="{{ 'parallaxLink'|_ }}" class="btn btn-primary" style="animation-delay: 600ms; opacity: 1;">{{ 'parallaxKatalog'|_ }}</a>
                     </div>
                 </div>
             </div>

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

@@ -22,11 +22,11 @@
             {% 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>
+                    <a href="#"><i class="icofont-shopping-cart"></i> {{ 'product.SebedeGos'|_ }}</a>
                 </div>
             {% else %}
                 <div class="product_add_to_cart">
-                    <a href="{{ 'login'|page }}"><i class="icofont-shopping-cart"></i> Sebede goş</a>
+                    <a href="{{ 'login'|page }}"><i class="icofont-shopping-cart"></i> {{ 'product.SebedeGos'|_ }}</a>
                 </div>
             {% endif %}
         </div>
@@ -36,6 +36,14 @@
         <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>
+        <h6>
+            {% if product.vendor.web2 > 0 %}
+                <del style="color: rgb(253, 0, 24);">{{ product.price }} TMT</del>
+                    {{ product.getDiscountedPrice(product.vendor.web2) }} TMT
+                {% else %}
+                    {{ product.price }} TMT
+            {% endif %}
+        </h6>
+        <span class="badge mt-2 {{ product.stock == 0 ? 'badge-secondary' : 'badge-success' }}">{{ product.stock == 0 ? 'productAdd.ZakazaGelyar'|_ : 'productAdd.ElimizdeBar'|_ }}</span>
     </div>
 </div>

themes/gurlushyk/partials/profile/modal.htm

@@ -3,7 +3,6 @@
 <!-- +++++++++++++++++++
     Bootstrap Default Modals
     ++++++++++++++++++++ -->
- 
         <!-- Modal -->
         <div class="modal fade" id="exampleModalLong" tabindex="-1" role="dialog" aria-labelledby="exampleModalLongTitle" aria-hidden="true">
             <div class="modal-dialog customModal" role="document">
@@ -20,19 +19,19 @@
                                 <div class="col-md-4 col-6" style="align-self: center;">
                                     <div class="row">
                                         <div class="col-md-12">
-                                        Iş Wagty: <a>{{userProfile.work_time}}</a>
+                                        {{ 'profileIsWagty'|_ }}: <a>{{userProfile.work_time}}</a>
                                         </div>
                                         <div class="col-md-12">
-                                        Telefon: <a href="http://{{userProfile.site}}" target="_blank">{{userProfile.username}}</a>
+                                        {{ 'profileTelefon'|_ }}: <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>
+                                        {{ 'profileSite'|_ }}: <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>
+                                        {{ 'profileTikTok'|_ }}: <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>
+                                        {{ 'profileInstagram'|_ }}: <a href="http://{{userProfile.instagram}}" target="_blank">{{userProfile.instagram}}</a>
                                         </div>
                                     </div>
                                 </div>
@@ -60,7 +59,7 @@
                          <div class="accountq">{{userProfile.map|raw}}</div>
                     </div>
                     <div class="modal-footer">
-                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Ýapmak</button>
+                        <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ 'modalYapmak'|_ }}</button>
                     </div>
                 </div>
             </div>

themes/gurlushyk/partials/profile/parallax.htm

@@ -7,7 +7,7 @@
                 <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>
+                    <a href="#" class="btn btn-primary" class="btn btn-primary" data-toggle="modal" data-target="#exampleModalLong" style="animation-delay: 600ms; opacity: 1;">{{ 'parallaxDolyMaglumat'|_ }}</a>
                 </div>
             </div>
         </div>

themes/gurlushyk/partials/profile/style1.htm

@@ -3,9 +3,6 @@
 <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">
                     
@@ -18,22 +15,22 @@
                             <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>
+                                    <label style="font-weight: 300;margin-bottom: 0px;">- {{ 'profileIsWagty'|_ }}: {{ 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>
+                                    <label style="font-weight: 300;margin-bottom: 0px;">- {{ 'profileTelefon'|_ }}: +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
+                                   {{ 'parallaxDolyMaglumat'|_ }}
                                 </button>
                             </div>
                         </div>
                     
                          <div class="widget catagory mb-30">
-                            <h6 class="widget-title" style="margin-bottom: 30px !important;">Kategoriýalar</h6>
+                            <h6 class="widget-title" style="margin-bottom: 30px !important;">{{ 'profileKategoriyalar'|_ }}</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>
+                                    - {{ 'profileKategoriyalarHemmesi'|_ }} <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' : '' }};">
@@ -67,11 +64,11 @@
                         <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="">{{ 'sortSaylanmadyk'|_ }}</option>
-                                    <option value="-price" {% if input('sort') == '-price' %} selected {% endif %}>Gymmatdan arzana</option>
+                                    <option value="-price" {% if input('sort') == '-price' %} selected {% endif %}>{{ 'sortGymmatdanArzana'|_ }}</option>
-                                    <option value="price" {% if input('sort') == 'price' %} selected {% endif %}>Arzandan gymmada</option>
+                                    <option value="price" {% if input('sort') == 'price' %} selected {% endif %}>{{ 'sortArzandanGymmada'|_ }}</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 %}>{{ 'sortTazedenKona'|_ }}</option>
-                                    <option value="created_at" {% if input('sort') == 'created_at' %} selected {% endif %}>Köneden täzä</option>
+                                    <option value="created_at" {% if input('sort') == 'created_at' %} selected {% endif %}>{{ 'sortKonedenTaza'|_ }}</option>
                                 </select>
                             </form>
                         </div>
@@ -134,7 +131,15 @@
                                     </div>
                                     <p class="brand_name"></p>
                                     <a href="{{ 'product'|page({id: product.id}) }}">{{ product.name }}</a>
-                                    <h6 class="product-price">{{ product.price }} TMT</h6>
+                                    <h6>
+                                        {% if product.vendor.web2 > 0 %}
+                                            <del style="color: rgb(253, 0, 24);">{{ product.price }} TMT</del>
+                                                {{ product.getDiscountedPrice(product.vendor.web2) }} TMT
+                                            {% else %}
+                                                {{ product.price }} TMT
+                                        {% endif %}
+                                    </h6>
+                                    <span class="badge mt-2 {{ product.stock == 0 ? 'badge-secondary' : 'badge-success' }}">{{ product.stock == 0 ? 'productAdd.ZakazaGelyar'|_ : 'productAdd.ElimizdeBar'|_ }}</span>
                                 </div>
                             </div>
                         </div>
@@ -147,7 +152,7 @@
                         <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>
+                                    <li class="page-item"><a class="page-link" href="{{ products.previousPageUrl }}{{params}}">{{ 'paginationOnki'|_ }}</a></li>
                                 {% endif %}
                     
                                 {% for page in range(1, products.lastPage) %}
@@ -161,7 +166,7 @@
                                 {% endfor %}
                     
                                 {% if products.lastPage > products.currentPage %}
-                                    <li class="page-item"><a class="page-link" href="{{ products.nextPageUrl }}{{params}}">Indiki</a></li>
+                                    <li class="page-item"><a class="page-link" href="{{ products.nextPageUrl }}{{params}}">{{ 'paginationIndiki'|_ }}</a></li>
                                 {% endif %}
                             </ul>
                         </nav>

themes/gurlushyk/partials/profile/style2.htm

@@ -13,7 +13,7 @@
             
             <div class="col-md-12">
             
-             <a href="{{ 'user-profile'|page({id: userProfile.id, slug: ''}) }}" class="tagCat {{ currentC == 'Hemme Harytlar' ? 'activeCat' : '' }}"> Hemmesi</a>
+             <a href="{{ 'user-profile'|page({id: userProfile.id, slug: ''}) }}" class="tagCat {{ currentC == 'Hemme Harytlar' ? 'activeCat' : '' }}"> {{ 'profileKategoriyalarHemmesi'|_ }}</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 %}
@@ -33,11 +33,11 @@
                         <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="">{{ 'sortSaylanmadyk'|_ }}</option>
-                                    <option value="-price" {% if input('sort') == '-price' %} selected {% endif %}>Gymmatdan arzana</option>
+                                    <option value="-price" {% if input('sort') == '-price' %} selected {% endif %}>{{ 'sortGymmatdanArzana'|_ }}</option>
-                                    <option value="price" {% if input('sort') == 'price' %} selected {% endif %}>Arzandan gymmada</option>
+                                    <option value="price" {% if input('sort') == 'price' %} selected {% endif %}>{{ 'sortArzandanGymmada'|_ }}</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 %}>{{ 'sortTazedenKona'|_ }}</option>
-                                    <option value="created_at" {% if input('sort') == 'created_at' %} selected {% endif %}>Köneden täzä</option>
+                                    <option value="created_at" {% if input('sort') == 'created_at' %} selected {% endif %}>{{ 'sortKonedenTaza'|_ }}</option>
                                 </select>
                             </form>
                         </div>
@@ -115,8 +115,15 @@
                                     
                                     <p class="brand_name"></p>
                                     <a href="{{ 'product'|page({id: product.id}) }}">{{ product.name }}</a>
-                                    <h6 class="product-price">{{ product.price }} TMT</h6>
+                                    <h6 class="product-price">
-                                    
+                                        {% if product.vendor.web2 > 0 %}
+                                            <del style="color: rgb(253, 0, 24);">{{ product.price }} TMT</del>
+                                                {{ product.getDiscountedPrice(product.vendor.web2) }} TMT
+                                            {% else %}
+                                                {{ product.price }} TMT
+                                        {% endif %}
+                                    </h6>
+                                    <span class="badge mt-2 {{ product.stock == 0 ? 'badge-secondary' : 'badge-success' }}">{{ product.stock == 0 ? 'productAdd.ZakazaGelyar'|_ : 'productAdd.ElimizdeBar'|_ }}</span>
                                     
                                 </div>
                             </div>
@@ -130,7 +137,7 @@
                         <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>
+                                    <li class="page-item"><a class="page-link" href="{{ products.previousPageUrl }}{{params}}">{{ 'paginationOnki'|_ }}</a></li>
                                 {% endif %}
                     
                                 {% for page in range(1, products.lastPage) %}
@@ -144,7 +151,7 @@
                                 {% endfor %}
                     
                                 {% if products.lastPage > products.currentPage %}
-                                    <li class="page-item"><a class="page-link" href="{{ products.nextPageUrl }}{{params}}">Indiki</a></li>
+                                    <li class="page-item"><a class="page-link" href="{{ products.nextPageUrl }}{{params}}">{{ 'paginationIndiki'|_ }}</a></li>
                                 {% endif %}
                             </ul>
                         </nav>

themes/gurlushyk/partials/profile/style3.htm

@@ -26,7 +26,7 @@
                     
                     
                     <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModalLong">
-                       Doly Maglumat
+                       {{ 'parallaxDolyMaglumat'|_ }}
                     </button>
                     
                     </div>

themes/gurlushyk/partials/profile/style4.htm

@@ -21,7 +21,7 @@
 
                     
                     <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#exampleModalLong">
-                       Doly Maglumat
+                       {{ 'parallaxDolyMaglumat'|_ }}
                     </button>
                     
                     </div>

themes/gurlushyk/partials/user/menu.htm

@@ -0,0 +1,14 @@
+[viewBag]
+==
+<div class="col-12 col-lg-3">
+    <div class="my-account-navigation mb-50">
+        <ul>
+            <li><a href="{{ 'my-offers'|page }}">{{ 'profileDropdown.Harytlarym'|_ }}</a></li>
+            <li><a href="{{ 'chat'|page }}">{{ 'profileDropdown.Hatlarym'|_ }}</a></li>
+            <li><a href="{{ 'my-orders'|page }}">{{ 'profileDropdown.Zakazlarym'|_ }}</a></li>
+            <li><a href="{{ 'vendor-settings'|page }}">{{ 'profileDropdown.DukanSazlamalary'|_ }}</a></li>
+            <li><a href="{{ 'my-comments'|page }}">{{ 'profileDropdown.Kammentarialar'|_ }}</a></li>
+            <li><a href="{{ 'vendor-sales'|page }}">{{ 'profileDropdown.GelenSargytlar'|_ }}</a></li>
+        </ul>
+    </div>
+</div>