Commit Graph

33 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 ffb487cff1 Product price indexing 2022-10-04 18:16:57 +05:30
merdan cc325024cf server-ownership-cahnged 2022-05-13 15:54:41 +05:00
root a4f9c3d00e server_modif 2022-04-04 13:04:24 +05:00
merdan 54f647c94c orders resource 2022-03-17 17:42:25 +05:00
merdan c8cc268909 Merge branch 'master' of https://github.com/bagisto/bagisto into elektronika 2022-03-16 17:21:27 +05:00
Devansh 3927800bce Notification Fixed 2022-03-15 17:32:03 +05:30
merdan 329a42ce36 marketplace 2022-01-24 13:25:55 +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 de746ed6b8 working on notification part 2021-12-30 20:18:00 +05:30
merdan 3929e7f051 Custom database seeder with bagisto faker 2021-10-25 22:16:18 +05:00
merdan 8d1dfe363a Custom database seeder 2021-10-24 20:49:12 +05:00
merdan 2922b4a002 Bulk Demo Category Seeder 2021-10-24 20:19:08 +05:00
Abdullah Al-Faqeir d0adff2058 - Use laravel default UserFactory file. 2021-10-06 16:57:52 +03: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 029b77df23 - Refactoring to Laravel 8 Class Model Factories. 2021-10-04 11:30:32 +03:00
devansh bawari 27f599d79d Database Seeders Updated And Namespace Added 2021-02-25 12:48:14 +05:30
jitendra 642fc1b10d Email marketing added 2021-01-04 21:40:56 +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
shubhammehrotra.symfony@webkul.com 835bbbbf9d updates 2020-01-08 17:24:24 +05:30
shubhammehrotra.symfony@webkul.com ae295909f5 minor changes 2020-01-07 12:32:41 +05:30
Prashant Singh 6da603530e
Cart rule inside promotions, various improvements and fixes. (#964)
* Some syntax issue fixes

* Adding discount things inside promotions in admin

* routes updated for creating discount rules

* fixed customer profile redirect parameter issue

* added cart and catalog rule routes to admin section

* migrations for discount almost to be finished, final revision left

* migrations for discounts complete

* catalog rule form underway

* catalog rule

* Made some dynamic form fields in catalog rule create form

* made some changes for custom validations used in ProductForm request class

* working on prepopulating the values fields in conditions

* need another revisit on discount rules tables and then prepare for actions

* removed discounts table

* catalog rule form changed to muliti attribute set for single condition

* new icons added for promotion and customer note. new action for customer added to take notes on the customers

* catalog and cart rule designs stable, now moving towards validations on client side and backend

* catalog rules migrations added

* catalog rule models added with contracts and proxies

* fixed customer group bug in customer registration controller

* fixed customer registration bug due to last fix

* fixed product card image not found issue

* catalog rule translations added

* Added migrations for cart rules and catalog rule products their contracts and remaining necessary files related to them.

* making cart attributes for cart rules

* Added more fields for cart rules

* working on conditions for cart rule form

* minor changes in migrations related to price rules

* currency and locale switcher now only available for a channel on storefront when more than on locale and currency are assigned to that channel

* part of conditions on the cart rule form added

* daily sync

* cart rate migrations updated

* Added select and multi select attributes options fetching with ajax on catalog rule form

* changed some migrations and data being populated at runtime inside catalog rule form

* catalog rule create complete, migrations changes, translations added

* catalog rule edit form complete

* catalog rule form complete, now moving towards catalog rule products

* added delete functionality for catalog rules

* added cart rule preferences for coupon codes

* cart rule submission problem due to repository issue

* Cart rule form and migrations complete

* Models and Repositories updated for cart rule usage

* base sync with master

* designing process to get suitable discount rules

* cart rule form completed

* added helpers in cart and discount to apply rules on cart at checkout or not

* cart rule coupon implementation in progress for discount coupon in shop checkout pages

* cart rules working

* added coupon box on checkout screen

* removed the conditions empty bug

* Nearing to completion of coupon based rules

* made some changes in cart rule coupon application on checkout related to new designs

* some bug fixes

* calculation for automatic cart rules complete

* non couponable cart rules implemented, now moving on to binding them on frontend

* some conditions improvements in couponable cart rules

* some bug fixes

* removed some bugs from summary blade for cart rule

* added the table for cart rule cart for managing rules with cart and removed various bug fixes

* some bug fixes

* Removed bugs and added coupon based cart rule removal functionality

* some bug fixes

* cart rule labels refactoring in midway

* Cart rule labels bug fixed

* removed margin classes from shop to UI

* Refactoring cart rule on front end

* added checks

* Discount rule implemented.

* cart rule bug fixes

* provision to remove the couponable and non couponable rule had been added

* Cart rule frontend work done

* altered some frontend variables on onepage checkout

* Altered cart rules to some extent
2019-06-10 13:19:05 +05:30
Prashant Singh c9f51db884 corrected discount cust grp table class name 2019-03-31 03:18:12 +05:30
Prashant Singh fc3c1a468b fixed issue #705 2019-03-30 16:44:21 +05:30
Prashant Singh fef1b2d8da Fixing of 3rd level menu issue for custom roles #705 2019-03-28 18:09:29 +05:30
rahul shukla 96b7f05c23 bagisto installer , #399 #400 #382 #301 #344 #214 #359 #223 #138 issue fixed 2018-12-31 17:27:32 +05:30
jitendra fbe8f844e1 Fixed seeders 2018-10-26 13:54:10 +05:30
jitendra 048bf9b0cf Default Database Factories, Migration Added 2018-06-20 11:21:39 +05:30
jitendra 0470cb7ece Project skeleton added 2018-06-20 10:36:27 +05:30
jitendra a052c28459 First Commit 2018-06-12 10:04:00 +05:30