From e18574feeaaa2407b52388a800130c57a04803b3 Mon Sep 17 00:00:00 2001 From: gerchek Date: Tue, 22 Aug 2023 14:33:34 +0500 Subject: [PATCH 1/5] added email for registration --- .../meilisearch_add_sortableAttributes.sh | 4 +-- .../meilisearch_get_index_settings.sh | 2 +- .../src/Http/Controllers/Registration.php | 7 +++++ .../TPS/Shop/src/Resources/lang/ru/app.php | 1 + .../TPS/Shop/src/Resources/lang/tm/app.php | 1 + .../customers/signup/signup-form.blade.php | 27 +++++++++++++++++++ .../views/shop/layouts/footer/index.blade.php | 2 +- 7 files changed, 40 insertions(+), 4 deletions(-) diff --git a/bash_scripts/meilisearch_add_sortableAttributes.sh b/bash_scripts/meilisearch_add_sortableAttributes.sh index 00462f7e6..3ce8e0e2a 100755 --- a/bash_scripts/meilisearch_add_sortableAttributes.sh +++ b/bash_scripts/meilisearch_add_sortableAttributes.sh @@ -7,10 +7,10 @@ API_KEY="YoUrV3ry-S3cur3-aP1k3Y" MEILISEARCH_URL="http://127.0.0.1:7700" # Set the index name -INDEX_NAME="products" +INDEX_NAME="products_index" # Set the attribute you want to make sortable -SORTABLE_ATTRIBUTE='"id","created_at","name","price","min_price"' +SORTABLE_ATTRIBUTE='"created_at","min_price","name"' # Create JSON payload for settings update SETTINGS_JSON='{ diff --git a/bash_scripts/meilisearch_get_index_settings.sh b/bash_scripts/meilisearch_get_index_settings.sh index a0bafc220..400335225 100755 --- a/bash_scripts/meilisearch_get_index_settings.sh +++ b/bash_scripts/meilisearch_get_index_settings.sh @@ -7,7 +7,7 @@ API_KEY="YoUrV3ry-S3cur3-aP1k3Y" MEILISEARCH_URL="http://127.0.0.1:7700" # Set the index name -INDEX_NAME="products" +INDEX_NAME="products_index" # Get index settings using cURL curl "$MEILISEARCH_URL/indexes/$INDEX_NAME/settings" \ diff --git a/packages/TPS/Shop/src/Http/Controllers/Registration.php b/packages/TPS/Shop/src/Http/Controllers/Registration.php index 4e6130a65..f301d1bc1 100644 --- a/packages/TPS/Shop/src/Http/Controllers/Registration.php +++ b/packages/TPS/Shop/src/Http/Controllers/Registration.php @@ -61,9 +61,16 @@ class Registration extends Controller public function create(CustomerSignupRequest $request){ $request->validated(); + if(is_null($request->email)) + { + $request->email = ''; + } + + $verify = core()->getConfigData('customer.settings.email.verification') ; $data = array_merge(request()->only('first_name', 'phone'), [ + 'email' => $request->email, 'password' => bcrypt(request()->input('password')), 'api_token' => Str::random(80), 'is_verified' => ! $verify , diff --git a/packages/TPS/Shop/src/Resources/lang/ru/app.php b/packages/TPS/Shop/src/Resources/lang/ru/app.php index 3abfbbcbb..d5707fce3 100644 --- a/packages/TPS/Shop/src/Resources/lang/ru/app.php +++ b/packages/TPS/Shop/src/Resources/lang/ru/app.php @@ -275,6 +275,7 @@ return [ 'city' => 'Город', 'postcode' => 'Почтовый индекс', 'phone' => 'Телефон', + 'agree' => 'Согласны ли Вы на рассылку уведомлений?', 'submit' => '«Сохранить адрес»', 'success' => 'Адрес был успешно добавлен.', 'error' => 'Невозможно добавить адрес.', diff --git a/packages/TPS/Shop/src/Resources/lang/tm/app.php b/packages/TPS/Shop/src/Resources/lang/tm/app.php index c6fff3fc5..206f8682a 100644 --- a/packages/TPS/Shop/src/Resources/lang/tm/app.php +++ b/packages/TPS/Shop/src/Resources/lang/tm/app.php @@ -418,6 +418,7 @@ return [ 'city' => 'Şäher', 'postcode' => 'zip belgisi', 'phone' => 'Telefon', + 'agree' => 'Duýduryşlary almaga razymy ?', 'submit' => 'Adresi ýada sal', 'success' => 'Adres ýada goşuldy.', 'error' => 'Adres goşulyp bilmedi' diff --git a/packages/TPS/Shop/src/Resources/views/shop/customers/signup/signup-form.blade.php b/packages/TPS/Shop/src/Resources/views/shop/customers/signup/signup-form.blade.php index 69035771d..2f5e6b870 100644 --- a/packages/TPS/Shop/src/Resources/views/shop/customers/signup/signup-form.blade.php +++ b/packages/TPS/Shop/src/Resources/views/shop/customers/signup/signup-form.blade.php @@ -27,6 +27,14 @@ @{{ errors.first('register.phone') }} +
+ {{ ucfirst(__('shop::app.customer.signup-form.email') )}} +
+ +
+
+ +
{{ ucfirst(__('shop::app.customer.signup-form.password')) }} @@ -37,6 +45,20 @@
+ +
+
+ + +
+
+ @{{ errors.first('register.agree') }} +
+
+ + +
{{ ucfirst(__('shop::app.customer.signup-text.account_exists')) }} @@ -80,6 +102,10 @@ first_name: '', + email: '', + + agree: '', + message: null, disable_button: false, @@ -101,6 +127,7 @@ if (result) { axios.post('{{ route('customer.register.create') }}', { phone: self.phone, + email: self.email, password:self.password, first_name:self.first_name }) diff --git a/packages/TPS/Shop/src/Resources/views/shop/layouts/footer/index.blade.php b/packages/TPS/Shop/src/Resources/views/shop/layouts/footer/index.blade.php index 375778021..f20f59163 100644 --- a/packages/TPS/Shop/src/Resources/views/shop/layouts/footer/index.blade.php +++ b/packages/TPS/Shop/src/Resources/views/shop/layouts/footer/index.blade.php @@ -39,7 +39,7 @@
{{__('shop::app.checkout.onepage.email')}} : - getConfigData('emails.configure.email_settings.shop_email_from'))}}">Send here + getConfigData('emails.configure.email_settings.shop_email_from'))}}">contact1@tehnikadunyasi.com
From b039005198af5344b4437bb4d2cf0a2266305477 Mon Sep 17 00:00:00 2001 From: gerchek Date: Tue, 22 Aug 2023 14:51:19 +0500 Subject: [PATCH 2/5] added email for registration --- packages/TPS/Shop/src/Resources/lang/tm/app.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/TPS/Shop/src/Resources/lang/tm/app.php b/packages/TPS/Shop/src/Resources/lang/tm/app.php index 206f8682a..3586353f6 100644 --- a/packages/TPS/Shop/src/Resources/lang/tm/app.php +++ b/packages/TPS/Shop/src/Resources/lang/tm/app.php @@ -418,7 +418,7 @@ return [ 'city' => 'Şäher', 'postcode' => 'zip belgisi', 'phone' => 'Telefon', - 'agree' => 'Duýduryşlary almaga razymy ?', + 'agree' => 'Bildirişleri almaga razymy ?', 'submit' => 'Adresi ýada sal', 'success' => 'Adres ýada goşuldy.', 'error' => 'Adres goşulyp bilmedi' From f079575bc0648d9e2021628264cf22fc8d45aebf Mon Sep 17 00:00:00 2001 From: gerchek Date: Fri, 25 Aug 2023 10:35:33 +0500 Subject: [PATCH 3/5] top menu changed --- packages/TPS/Shop/src/Resources/lang/ru/app.php | 1 + packages/TPS/Shop/src/Resources/lang/tm/app.php | 1 + .../views/shop/layouts/header/category-nav.blade.php | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/TPS/Shop/src/Resources/lang/ru/app.php b/packages/TPS/Shop/src/Resources/lang/ru/app.php index d5707fce3..57e78a697 100644 --- a/packages/TPS/Shop/src/Resources/lang/ru/app.php +++ b/packages/TPS/Shop/src/Resources/lang/ru/app.php @@ -48,6 +48,7 @@ return [ 'service' => 'Сервисный центр', 'refund' => 'Обмен и возврат товара', 'help' => 'Помощь по сайту', + 'ordering' => 'Как оформить заказ', ], diff --git a/packages/TPS/Shop/src/Resources/lang/tm/app.php b/packages/TPS/Shop/src/Resources/lang/tm/app.php index 3586353f6..1e675a366 100644 --- a/packages/TPS/Shop/src/Resources/lang/tm/app.php +++ b/packages/TPS/Shop/src/Resources/lang/tm/app.php @@ -195,6 +195,7 @@ return [ 'service' => 'Hyzmat', 'refund' => 'Çalyşmak we gaýtarmak', 'help' => 'Kömek', + 'ordering' => 'Nädip sargyt etmeli', ], diff --git a/packages/TPS/Shop/src/Resources/views/shop/layouts/header/category-nav.blade.php b/packages/TPS/Shop/src/Resources/views/shop/layouts/header/category-nav.blade.php index 9e6bf995c..0757ca0e3 100644 --- a/packages/TPS/Shop/src/Resources/views/shop/layouts/header/category-nav.blade.php +++ b/packages/TPS/Shop/src/Resources/views/shop/layouts/header/category-nav.blade.php @@ -38,8 +38,8 @@
  • - - {{__('shop::app.header.help')}} + + {{__('shop::app.header.ordering')}}
  • From 8b7fc14c186150ac4b89c31b22d13b4df3efe6e1 Mon Sep 17 00:00:00 2001 From: gerchek Date: Tue, 24 Oct 2023 11:14:01 +0500 Subject: [PATCH 4/5] adding weeklyOffers API --- packages/TPS/API/Http/Controllers/Sliders.php | 12 ++++++++++++ packages/TPS/API/Http/routes.php | 1 + 2 files changed, 13 insertions(+) diff --git a/packages/TPS/API/Http/Controllers/Sliders.php b/packages/TPS/API/Http/Controllers/Sliders.php index 042386a84..87a701632 100644 --- a/packages/TPS/API/Http/Controllers/Sliders.php +++ b/packages/TPS/API/Http/Controllers/Sliders.php @@ -5,6 +5,7 @@ namespace TPS\API\Http\Controllers; use Illuminate\Http\Request; use TPS\API\Http\Resources\Core\Slider; use TPS\Shop\Repositories\SliderRepository; +use TPS\Shop\Repositories\ProductFlatRepository; use Webkul\RestApi\Http\Controllers\V1\Shop\ShopController; use Carbon\Carbon; class Sliders extends ShopController @@ -48,4 +49,15 @@ class Sliders extends ShopController return $this->getResourceCollection($results); } + + public function weeklyOffers(ProductFlatRepository $productFlatRepository) + { + $discounted_products = $productFlatRepository->weeklyOffers(); + + $response = [ + 'data' => $discounted_products, + ]; + + return response()->json($response); + } } \ No newline at end of file diff --git a/packages/TPS/API/Http/routes.php b/packages/TPS/API/Http/routes.php index cb7fc1ad2..872176abe 100644 --- a/packages/TPS/API/Http/routes.php +++ b/packages/TPS/API/Http/routes.php @@ -24,6 +24,7 @@ Route::group(['prefix' => 'api','middleware' => ['locale', 'currency']], functio Route::get('channels',[Channels::class, 'index']); Route::get('contacts',[CMS::class,'contacts']); Route::get('sliders',[Sliders::class, 'allResources']); + Route::get('weeklyOffers',[Sliders::class, 'weeklyOffers']); /** * category routes */ From 5c7c19096f60e774b21fac58e475e187627ea87f Mon Sep 17 00:00:00 2001 From: gerchek Date: Wed, 25 Oct 2023 11:53:40 +0500 Subject: [PATCH 5/5] The weeklyOffers API has been changed. --- packages/TPS/API/Http/Controllers/Sliders.php | 14 ++++------- .../src/Repositories/SliderRepository.php | 23 +++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/packages/TPS/API/Http/Controllers/Sliders.php b/packages/TPS/API/Http/Controllers/Sliders.php index 87a701632..474ed7107 100644 --- a/packages/TPS/API/Http/Controllers/Sliders.php +++ b/packages/TPS/API/Http/Controllers/Sliders.php @@ -5,7 +5,7 @@ namespace TPS\API\Http\Controllers; use Illuminate\Http\Request; use TPS\API\Http\Resources\Core\Slider; use TPS\Shop\Repositories\SliderRepository; -use TPS\Shop\Repositories\ProductFlatRepository; +use TPS\API\Http\Resources\Catalog\Product as ProductResource; use Webkul\RestApi\Http\Controllers\V1\Shop\ShopController; use Carbon\Carbon; class Sliders extends ShopController @@ -50,14 +50,10 @@ class Sliders extends ShopController return $this->getResourceCollection($results); } - public function weeklyOffers(ProductFlatRepository $productFlatRepository) + public function weeklyOffers() { - $discounted_products = $productFlatRepository->weeklyOffers(); - - $response = [ - 'data' => $discounted_products, - ]; - - return response()->json($response); + $products = $this->getRepositoryInstance()->getWeeklyOffers(); + $productsArray = ProductResource::collection($products); + return response()->json(['data' => $productsArray]); } } \ No newline at end of file diff --git a/packages/TPS/Shop/src/Repositories/SliderRepository.php b/packages/TPS/Shop/src/Repositories/SliderRepository.php index 57cc7da5e..07efee354 100644 --- a/packages/TPS/Shop/src/Repositories/SliderRepository.php +++ b/packages/TPS/Shop/src/Repositories/SliderRepository.php @@ -20,4 +20,27 @@ class SliderRepository extends SliderRepo ->orderBy('sort_order', 'ASC') ->get(); } + + public function getWeeklyOffers() + { + $results = app(ProductFlatRepository::class)->scopeQuery(function ($query) { + + $locale = core()->getRequestedLocaleCode(); + + $qb = $query->distinct() + ->where('channel', core()->getCurrentChannelCode()) + ->where('product_flat.locale', $locale) + ->whereNotNull('special_price') + ->whereNotNull('special_price_to') + ->whereNotNull('special_price_from') + ->whereDate('special_price_from','<=',Carbon::today()) + ->whereDate('special_price_to','>=',Carbon::today()) + ->limit(8); + + return $qb->inRandomOrder(); + + })->get(); + + return $results; + } } \ No newline at end of file