Commit Graph

143 Commits

Author SHA1 Message Date
merdan c40eb25137 Merge branch 'master' of https://github.com/bagisto/bagisto into balance
 Conflicts:
	composer.lock
	packages/Webkul/Admin/src/Resources/lang/ben/app.php
	packages/Webkul/Admin/src/Resources/lang/ru/app.php
	packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
	packages/Webkul/Core/src/Core.php
	packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
	packages/Webkul/Customer/src/Http/Requests/CustomerAddressRequest.php
	packages/Webkul/Product/src/Helpers/AbstractProduct.php
	packages/Webkul/Product/src/Helpers/Toolbar.php
	packages/Webkul/Product/src/Models/ProductFlat.php
	packages/Webkul/Shipping/src/Config/system.php
	packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
	packages/Webkul/Tax/src/Http/Controllers/TaxController.php
	packages/Webkul/Ui/src/Resources/lang/ben/app.php
2022-12-15 16:39:57 +05:00
Vivek Sharma 563685b70f [Updated: alias changed to Barryvdh\DomPDF\Facade\Pdf.] 2022-10-27 19:10:15 +05:30
merdan dfb6a72b8c Merge branch 'master' of https://github.com/bagisto/bagisto into elektronika
 Conflicts:
	composer.lock
	packages/Webkul/Customer/src/Http/Controllers/CustomerController.php
	packages/Webkul/Product/src/Models/ProductFlat.php
2022-07-21 10:59:43 +05:00
Devansh Bawari 062145eed4 DOM PDF Updated 2022-07-19 09:48:49 +05:30
merdan cc325024cf server-ownership-cahnged 2022-05-13 15:54:41 +05:00
merdan 714c13f248 Merge branch 'master' of https://github.com/bagisto/bagisto into elektronika
 Conflicts:
	README.md
	composer.json
	composer.lock
	config/app.php
	public/installer/Classes/Requirement.php
2022-04-02 12:06:51 +05:00
jitendra ed1e0a5fe8 Issue #5960 fixed 2022-04-01 17:20:09 +05:30
merdan 8b2dab8dac Merge branch 'master' of https://github.com/bagisto/bagisto into elektronika 2022-03-18 15:51:46 +05:00
jitendra 0080ca42c0 Updated changelog, fixed bagisto version display issue 2022-03-17 12:59:58 +05:30
merdan 2235f33f5a countries states 2022-03-09 13:51:43 +05:00
merdan cba05d973f rename packege name 2022-02-04 16:44:32 +05:00
merdan 8b479de28b api customer addresses 2022-02-04 12:06:11 +05:00
merdan d77329a9f2 marketplace removed 2022-01-24 13:57:11 +05:00
merdan c700c9be60 marketplace 2022-01-24 13:25:31 +05:00
merdan 963e31616e elektornika after update 2022-01-21 15:45:34 +05:00
merdan 66f864602c Merge branch 'elektronika'
# Conflicts:
#	README.md
#	composer.json
#	composer.lock
#	config/app.php
#	config/scout.php
#	packages/Webkul/API/Http/Resources/Checkout/Cart.php
#	packages/Webkul/API/Http/Resources/Sales/Order.php
#	packages/Webkul/API/Http/routes.php
#	public/installer/Classes/Requirement.php
2022-01-21 15:09:53 +05:00
Devansh fff092adf4 Version Improvement 2022-01-07 11:11:50 +05:30
Deepak Singh Gusain 38306a444d New Theme Work Done 2021-12-30 19:00:13 +05:30
Devansh 7c953c8aa3 Package Moved 2021-11-19 16:18:59 +05:30
Devansh 11dbe23d12 API Package Removed 2021-11-19 10:02:04 +05:30
Devansh f36275bf9f Packages Updated 2021-11-18 18:41:13 +05:30
merdan 9254d048b5 Channels list with sliders 2021-10-27 21:06:17 +05:00
merdan 2922b4a002 Bulk Demo Category Seeder 2021-10-24 20:19:08 +05:00
Devansh 5d754c01a1 Fixed #5232 2021-10-19 12:29:27 +05:30
devansh bawari 01fef431b1 Captcha Backend Completed 2021-06-25 17:06:47 +05:30
devansh bawari 2a91392780 Filtered Config Files 2021-05-19 14:58:53 +05:30
prateek srivastava d94f786efb Merge branch 'master' of https://github.com/bagisto/bagisto 2021-01-06 15:48:15 +05:30
jitendra 642fc1b10d Email marketing added 2021-01-04 21:40:56 +05:30
prateek srivastava b57bcdc39e product video facade added 2021-01-04 16:38:38 +05:30
prateek srivastava 7157318d18 product image facade added 2021-01-04 13:57:45 +05:30
jitendra 711beb1786 Added Bagisto Debugbar 2020-11-24 17:48:37 +05:30
devansh bawari c1ed893bdf Barry Debugger Dependency Set 2020-11-04 14:40:00 +05:30
Devansh fdd6881076 Env Validator Added 2020-08-25 17:21:20 +05:30
ghermans 8c4e1bbc3b Fixed #3595 2020-07-29 22:23:15 +02:00
Pranshu Tomar 4681205f17 Social login completed 2020-06-26 19:09:53 +05:30
Pranshu Tomar 10c31e27ad Updated change log file 2020-04-28 18:59:18 +05:30
Jitendra Singh 792720354f Version updated 2020-03-19 19:04:33 +05:30
Jitendra Singh 0f42e8ff8f Resolved conflicts 2020-02-27 12:07:20 +05:30
ghermans 3365924529 #2525 updated config file 2020-02-25 03:30:13 +01:00
ghermans bb9c90d0a2 #2525 Added locale, timezone and currency 2020-02-25 03:29:33 +01:00
Jitendra Singh 5c696f8d00 Resolved conflicts 2020-02-21 19:36:17 +05:30
Jitendra Singh fa53b72058 Booking product type added 2020-02-14 11:40:12 +05:30
Steffen Mahler ae467fc182 merge master, refactoring tests 2020-02-04 18:13:09 +01:00
Steffen Mahler dd8f653df4 minor improvements 2020-02-04 14:48:15 +01:00
Steffen Mahler 01010db842 set default_country to null, add fallback for test 2020-02-04 14:38:52 +01:00
Steffen Mahler 763ccf3af9 set default_country to EN 2020-02-04 14:33:25 +01:00
Steffen Mahler 8abce3302a tax helper introduced, views changed to display multiple tax rates 2020-01-31 16:08:01 +01:00
shubhammehrotra.symfony@webkul.com d23d3b4f8c search in particular category 2020-01-29 17:33:28 +05:30
shubhammehrotra.symfony@webkul.com 1b368789e5 bagisto velocity theme updates 2020-01-26 14:17:05 +05:30
Jitendra Singh 5a104142f3
Revert "Bagisto theme added" 2020-01-25 13:07:55 +05:30