Commit Graph

870 Commits

Author SHA1 Message Date
merdan 1c5ed87379 sort fixing 2022-04-16 13:04:20 +05:00
merdan 05164c42c1 sort fixing 2022-04-15 15:55:39 +05:00
merdan 008f7bad2b filter fix 2022-04-15 15:03:55 +05:00
merdan 8361c877e0 filter fix 2022-04-15 14:16:02 +05:00
merdan 5a0c67fef4 filter fix 2022-04-15 13:34:11 +05:00
merdan 8e5428159e filter fix 2022-04-15 13:21:25 +05:00
merdan ae0d7df821 remove admin_locale 2022-04-15 12:38:10 +05:00
merdan 7a55f7384f remove admin_locale 2022-04-15 12:20:23 +05:00
merdan 0e819f43fe Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
 Conflicts:
	public/installer/Seeder.php
2022-04-13 18:46:20 +05:00
Devansh eae1c6b7f4 Duplicate Query Removed 2022-04-13 16:46:33 +05:30
merdan d4d1da389f Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
 Conflicts:
	composer.json
	composer.lock
	config/app.php
	packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
	packages/Webkul/Velocity/src/Http/Controllers/Shop/Controller.php
2022-04-04 13:46:05 +05:00
merdan cdd9a0a907 superattrbt 2022-04-02 13:25:13 +05:00
jitendra 74416ac5f3 Used PHP 8 Constructor Property Promotion 2022-04-01 20:27:11 +05:30
merdan 45e0d6fe7e Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-04-01 12:31:02 +05:00
jitendra be8012781b Issue #6174 fixed 2022-03-30 11:24:23 +05:30
merdan b6c46480aa Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
 Conflicts:
	composer.lock
2022-03-25 16:18:54 +05:00
jitendra bd58694b6e Merge with master 2022-03-24 12:51:07 +05:30
jitendra bfbd64cb22 Issue #5399 fixed (Back to top button added) 2022-03-24 11:55:54 +05:30
merdan 74cb937809 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-03-15 15:43:31 +05:00
Devansh b6f26e19a5 Refactored 2022-03-15 11:27:33 +05:30
Devansh a6dd937bd4 Filter Issue Fixed 2022-03-14 20:01:44 +05:30
merdan 84d77539e9 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1
 Conflicts:
	composer.lock
	packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php
2022-02-22 17:50:56 +05:00
prateek srivastava 384c1a7198 issue #5820 fixed 2022-02-16 19:01:20 +05:30
Devansh 187e7d816d Merge branch 'master' into s3-image-cache 2022-02-15 09:27:28 +05:30
Devansh 9d99fdf186 All Destroy Method Updated 2022-02-11 18:04:38 +05:30
Devansh 4b70fe3b23 Delete Message Fixed 2022-02-11 17:05:38 +05:30
Devansh 85293ca642 Local Driver Checking 2022-02-10 12:09:14 +05:30
Devansh 818ee8c8de Image Cache Restricted For Local Only 2022-02-09 19:23:56 +05:30
Devansh 2167a32834 Product Image Refactored 2022-02-09 19:04:47 +05:30
Devansh 5bb56f708c Datagrid Trait Plus Added And Test Case Improved 2022-02-07 16:06:38 +05:30
merdan 91b7e84cb6 Merge branch 'master' of https://github.com/bagisto/bagisto into dev
 Conflicts:
	packages/Webkul/Core/src/Core.php
	packages/Webkul/Product/src/Models/ProductImage.php
2022-02-05 14:43:51 +05:00
Devansh 6d8ef13120 Variant Images Handled 2022-02-03 17:44:45 +05:30
Devansh 757dc9a8ed Refactored Image And Video Repository 2022-02-03 16:42:37 +05:30
Devansh fb1fbfb873 Moved Video Accordion After Images 2022-02-03 14:41:08 +05:30
Devansh 3b91f5edbd Video Draggable Feature Added 2022-02-03 14:08:34 +05:30
Devansh e45063c43c Updated Key Name 2022-02-02 13:08:31 +05:30
Devansh 59e49320f7 Commenting Updated 2022-02-02 12:48:14 +05:30
Devansh 5107b01df8 Some Model Position Query Fixed 2022-02-02 12:23:11 +05:30
Devansh 5317fedd21 Positions Updated 2022-02-02 12:09:29 +05:30
Devansh c9a4a6c4f1 Added Migration And Position And Updated Image Repository 2022-02-01 20:34:28 +05:30
merdan 690a33710f Merge branch 'master' of https://github.com/bagisto/bagisto into dev
 Conflicts:
	.env.example
	README.md
	composer.json
	composer.lock
	config/app.php
	config/scout.php
	packages/Webkul/API/Http/Controllers/Shop/AddressController.php
	packages/Webkul/API/Http/Resources/Checkout/Cart.php
	packages/Webkul/API/Http/Resources/Sales/Order.php
	packages/Webkul/API/Http/routes.php
	packages/Webkul/Core/src/Contracts/Validations/AlphaNumericSpace.php
	packages/Webkul/Core/src/Resources/lang/fa/validation.php
	packages/Webkul/Core/src/Resources/lang/it/app.php
	packages/Webkul/Core/src/Resources/lang/pt_BR/app.php
	packages/Webkul/Core/src/Resources/lang/tr/app.php
	packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php
	packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
	packages/Webkul/Shop/src/Resources/views/customers/account/wishlist/wishlist-product.blade.php
	packages/Webkul/Velocity/publishable/assets/js/components.js
	packages/Webkul/Velocity/publishable/assets/js/manifest.js
	public/installer/Classes/Requirement.php
2022-02-01 15:01:06 +05:00
merdan f1f94416bc refactoring and product search by brand fix 2022-02-01 12:40:27 +05:00
merdan a773d2a837 refactoring and product search by brand 2022-02-01 12:33:34 +05:00
Devansh 7a8fa99301 Image Cache Added 2022-01-31 19:30:16 +05:30
Devansh 63b694a673 Squashed Commits 2022-01-31 12:14:02 +05:30
merdan d4281d67cf brand product relation and address 2022-01-27 20:07:05 +05:00
Devansh 9bcff0ef15 Slug Bug Fixed 2022-01-21 15:21:19 +05:30
merdan e1bd5dd1e9 product scrap create 2022-01-12 12:35:04 +05:00
Devansh 0c486dcf61 Lock File Updated And Squashed All Commits 2022-01-11 18:52:47 +05:30
Devansh 0bf0ab1f72 Some More Events Moved 2022-01-10 20:51:59 +05:30