Commit Graph

204 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
jitendra 26d5d14ef4 Fixed issues 2022-10-27 16:48:06 +05:30
jitendra 1a499b827c Removed bagisto faker from composer.json 2022-10-21 18:10:20 +05:30
jitendra 71d6198e03 Elastic search 2022-10-20 18:33:11 +05:30
jitendra f3be56aea4 Added CategoryTranslation factory 2022-10-14 15:54:48 +05:30
jitendra e105aa7179 Faker 2022-10-12 23:02:19 +05:30
jitendra 04c54c5058 Updated to new rest api and removed lagecy api 2022-10-06 16:37:55 +05:30
merdan bcc9debe99 Merge branch 'master' of https://github.com/bagisto/bagisto into elektronika
 Conflicts:
	packages/Webkul/Shop/src/Http/Controllers/CartController.php
2022-08-25 14:06:45 +05:00
Devansh Bawari ae9582db98 Test Case Updated 2022-07-26 15:26:29 +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 cc5b143515 PHP Version Updated 2022-07-19 09:52:27 +05:30
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
jitendra bfbd64cb22 Issue #5399 fixed (Back to top button added) 2022-03-24 11:55:54 +05:30
jitendra 1b7a7ce7ba Issue #5963 fixed (Upgraded to Laravel 9) 2022-03-23 18:58:30 +05:30
merdan 2235f33f5a countries states 2022-03-09 13:51:43 +05:00
merdan 7dfb10b650 Merge branch 'master' into elektronika
# Conflicts:
#	composer.json
#	composer.lock
#	config/app.php
#	packages/Webkul/Core/src/Core.php
2022-02-15 17:33:15 +05:00
merdan ce6a49d515 upstream update 2022-02-15 17:27:01 +05:00
merdan 4d6d424b14 Merge branch 'master' of https://github.com/bagisto/bagisto
 Conflicts:
	composer.lock
2022-02-15 17:14:31 +05:00
dependabot[bot] 3e44fe6636
Bump enshrined/svg-sanitize from 0.14.1 to 0.15.0
Bumps [enshrined/svg-sanitize](https://github.com/darylldoyle/svg-sanitizer) from 0.14.1 to 0.15.0.
- [Release notes](https://github.com/darylldoyle/svg-sanitizer/releases)
- [Commits](https://github.com/darylldoyle/svg-sanitizer/compare/0.14.1...0.15.0)

---
updated-dependencies:
- dependency-name: enshrined/svg-sanitize
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-15 00:45:26 +00:00
merdan cba05d973f rename packege name 2022-02-04 16:44:32 +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 0c486dcf61 Lock File Updated And Squashed All Commits 2022-01-11 18:52:47 +05:30
Deepak Singh Gusain 38306a444d New Theme Work Done 2021-12-30 19:00:13 +05:30
AmooAti d5b1fb259d update all dependencies and compatible with PHP 8.1 2021-12-12 00:40:50 +03:30
Devansh 7c953c8aa3 Package Moved 2021-11-19 16:18:59 +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 3929e7f051 Custom database seeder with bagisto faker 2021-10-25 22:16:18 +05:00
merdan 2922b4a002 Bulk Demo Category Seeder 2021-10-24 20:19:08 +05:00
Devansh b9ec59947a Added Breadcrumb And Yielding Done In Default Theme 2021-10-20 11:06:05 +05:30
Abdullah Al-Faqeir 7b612ecc67 - Fix trigger yaml file to user laravel instead of larave5.
- Remove codeception/module-laravel5 as it was causing trigger testing to fail since it's outdated and we already upgraded factories to laravel 8.
2021-10-05 12:37:21 +03:00
Abdullah Al-Faqeir 1320e493d2 - working on test cases.
- update codeception driver for laravel.
2021-10-04 16:35:47 +03:00
Abdullah Al-Faqeir 029b77df23 - Refactoring to Laravel 8 Class Model Factories. 2021-10-04 11:30:32 +03:00
Glenn Hermans d66f5526c6
Added support section for composer 2021-06-17 20:06:45 +02:00
Devansh e3817973e7 Dev Branch Added To Tymon Auth 2021-05-18 04:21:08 +00:00
devansh bawari 46d2484b70 Version Updated 2021-05-17 18:23:50 +05:30
devansh bawari f2617a7013 Dependency Updated 2021-05-17 17:57:49 +05:30
devansh bawari c71fa83b84 Test Case Portion 1 2021-04-13 17:28:51 +05:30
Devansh 97afaf7261 Merged 2021-03-31 05:11:15 +00:00
devansh bawari f16d9b0b91 Dependency Updated 2021-03-30 13:53:43 +05:30
devansh bawari ca85df8998 Reverted Some Code 2021-03-30 13:42:31 +05:30
devansh bawari a33f7428a9 Time Issue Fixed 2021-03-30 13:37:29 +05:30
devansh bawari 3f476bae52 Dependency Updated 2021-03-30 13:31:30 +05:30
devansh bawari 4cadfbc94d PHP 8 Support Added 2021-03-25 20:04:47 +05:30
devansh bawari e525e227ef Depedency Updated 2021-03-02 13:57:35 +05:30