Commit Graph

849 Commits

Author SHA1 Message Date
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
Devansh f3902b94a3 Fixed With Proper Consistensy 2022-01-06 09:37:26 +05:30
Devansh 230d59af9c Added Bageds 2022-01-03 19:09:09 +05:30
merdan 4eb0456e7c product resource 2021-12-22 20:53:36 +05:00
Devansh 0a9006cbde Reverted PR 2021-12-22 20:27:56 +05:30
David Galet 0f84b8b6a3 Fix from son to mother 2021-12-22 14:40:40 +01:00
Devansh df152d84cb Quantity Added 2021-12-22 12:30:37 +05:30
merdan 607aed02a5 scraper controller 2021-12-19 01:20:59 +05:00
Devansh 2bba637518 Null Issue Fixed 2021-12-16 10:12:00 +05:30
Vivek be1d10248c [Updated: customer_group event and Models mappings.] 2021-12-05 16:42:36 +05:30
Devansh 899e16420d Some Commentings And Arrangement Done 2021-12-01 13:19:26 +05:30
Devansh 683ef6329a Filtering Issue Fixed 2021-12-01 12:42:18 +05:30
JunaidJaved248 a8fb960ddb
Merge branch 'master' into dev-jj 2021-11-11 15:06:18 +05:00
Devansh e17c804c84 Comments Fixed 2021-11-11 10:39:21 +05:30
Devansh 486dca8643 Fallback Added 2021-11-11 10:38:10 +05:30
junaidjaved248 b0ea6acb75 Quantity issue in product shipment Issue #5315 Fixed 2021-11-11 00:53:57 +05:00
Devansh bbe2cab4f5 Slider Issue Fixed 2021-11-03 16:12:40 +05:30
Abdul Rehman d4cd3298ee
Fixed class name
Changed class name in bundle option relationship. Because There is no ProductBundleProductProxy class. It is related to ProductBundleOptionProxy class.
2021-10-30 12:09:37 +05:00
Devansh 7a1ef2bb85 Spaces Added 2021-10-26 13:00:32 +05:30
Devansh f6db7fe7ac Base Structure And Methods Refactore For AJAX Call 2021-10-25 19:07:29 +05:30
Leandro Henrique Reis 79c16b2ac3
Unnecessary class 2021-10-12 12:05:12 -03:00
Glenn Hermans 916cd184b6
Merge pull request #5190 from AbdullahFaqeir/master
- Refactoring to Laravel 8 Class Model Factories.
2021-10-07 12:02:32 +02:00