merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,254 Commits 1 Branch 0 Tags 196 MiB
Commit Graph

289 Commits

Author SHA1 Message Date
merdan 6d4bee4e14 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 
 Conflicts:
	packages/Webkul/Category/src/Repositories/CategoryRepository.php
	packages/Webkul/Product/src/Listeners/ProductFlat.php
	packages/Webkul/Sales/src/Repositories/InvoiceRepository.php
 2022-09-03 15:51:08 +05:00
jitendra 0d073a2ef0 Refactored repositories model method 2022-08-10 20:40:59 +05:30
jitendra 8c61634698 Fixed shipping create issue and refactored models 2022-08-09 17:49:38 +05:30
jitendra acf9626219 Optimized and refactored code 2022-08-08 18:40:37 +05:30
Jitendra Singh d9ef6bdd7c
Merge pull request #6528 from akathuria289/issue_fixed_#6428 
Fixed issue #6428
 2022-08-03 12:10:59 +05:30
merdan ae72375120 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 
 Conflicts:
	composer.json
	composer.lock
	packages/Webkul/Product/src/Listeners/ProductFlat.php
	packages/Webkul/Velocity/src/Http/Controllers/Shop/ShopController.php
 2022-07-25 16:09:17 +05:00
merdan a4b1fe4840 Revert "server-folder-permissions" 
This reverts commit a8c31e1a44.
 2022-07-25 15:49:44 +05:00
jitendra e1a0c0b8c6 Convert if else statement to PSR-2 standard 2022-07-12 17:34:13 +05:30
Abhishek Kathuria d7388a86bd Fixed issue #6428 2022-07-07 12:26:58 +05:30
Your Name a8c31e1a44 server-folder-permissions 2022-05-13 16:01:33 +05:00
merdan 306854b3d1 Merge branch 'master' of https://github.com/bagisto/bagisto into sarga-v1 2022-04-21 18:17:31 +05:00
Devansh 56504d9fb9 Ship Quantity Added And Then Deducted 2022-04-18 18:14:29 +05:30
merdan 2aa149364c vendors 2022-04-13 20:01:40 +05:00
merdan 3f5323dce3 vendors 2022-04-13 19:55:45 +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
jitendra 5dc3e61c08 Issue #6267 fixed 2022-04-07 17:56:01 +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
jitendra 74416ac5f3 Used PHP 8 Constructor Property Promotion 2022-04-01 20:27:11 +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 e810b84369 New Customer Syncing Added 2022-03-15 14:30:01 +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
merdan 3ccddbf443 category filters 2022-02-03 13:34:16 +05:00
Devansh c9b60b2c10 Squashed All Commits 2022-02-01 16:44:16 +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
Devansh 0fe5b20bda
Merge pull request #5675 from akhtarkhan1/product-download 
–Fixed Download product issue #5663
 2022-01-25 13:29:57 +05:30
Akhtar Khan 33b422b29c resolve issue of downloadable product when it gets cancelled #5663 2022-01-25 10:47:31 +05:30
Devansh 72d6a2857b Total Weight Added 2022-01-24 12:19:11 +05:30
Devansh f3902b94a3 Fixed With Proper Consistensy 2022-01-06 09:37:26 +05:30
Deepak Singh Gusain 7f3b71c0c0 work on ui part 2021-12-31 18:27:34 +05:30
merdiano 296f09d424 vendor categories 2021-12-29 08:05:55 +05:00
David Galet 0f84b8b6a3 Fix from son to mother 2021-12-22 14:40:40 +01:00
Devansh fcf2d11bd8 Zero Error Fixed 2021-12-21 15:50:23 +05:30
Devansh 7cd753387b Invalid Quantity Fixed 2021-12-17 12:44:38 +05:30
Devansh 236a52a4d2 Invalid Quantity Refund Issue Fixed 2021-12-16 10:01:49 +05:30
David Callizaya da81cc455e Add next_reminder_at column on invoices table 2021-10-30 12:30:58 -04:00
David Callizaya 6118483c4f Add interval between remiders sent 2021-10-30 11:38:57 -04:00
David Callizaya 64d84943bd Add Config interval between reminders 2021-10-30 11:23:36 -04:00
David Callizaya 2dd2bcdc57 Get invoice in overdue and in reminders limit 2021-10-28 17:51:01 -04:00
David Callizaya dc7be8fc77 Add reminders column on invoices table 2021-10-28 17:46:18 -04:00
David Callizaya 189dd396d6 Cron command to send reminders 2021-10-28 17:32:37 -04:00
David Callizaya deb51733e7 Add sendInvoiceReminder 2021-10-28 17:21:34 -04:00
David Callizaya 4a0145a825 Add admin invoice reminders limit 2021-10-28 17:03:27 -04:00
Glenn Hermans bcc28b24d4
fixed typo 2021-10-23 15:15:57 +02:00
Glenn Hermans 65b0ff0ac1
fix #5047 2021-10-23 14:34:34 +02:00
Glenn Hermans 10e7415472
Added method to check for pending invoices 2021-10-23 14:33:02 +02:00
Glenn Hermans 1ed243ebd5
Added transaction amount column 2021-10-23 13:20:38 +02:00
Abdullah Al-Faqeir 8e3c43bd19 - Fixing coding style. 
- Fixing typo.
 2021-10-06 15:26:08 +03:00
Abdullah Al-Faqeir 2ab4873e5c - Fix code style. 2021-10-05 11:56:28 +03:00
Abdullah Al-Faqeir 7a94b5233e - Fix test cases. 
- Code reformat.
 2021-10-05 11:39:30 +03:00
Abdullah Al-Faqeir 1320e493d2 - working on test cases. 
- update codeception driver for laravel.
 2021-10-04 16:35:47 +03:00