Commit Graph

135 Commits

Author SHA1 Message Date
Prashant Singh f1f0bcac8c Dead mods removed 2019-09-03 12:24:20 +05:30
Prashant Singh 49c2f1c9d8 Slider content work complete 2019-08-23 18:01:44 +05:30
Prashant Singh 0c79d87503 Removed stripe fees visibility from every where 2019-08-23 13:15:10 +05:30
Prashant Singh b62b277cac Integrated GTM 2019-08-23 08:56:25 +05:30
Prashant Singh a29409b1a4 Base sync 2019-08-19 16:11:09 +05:30
Prashant Singh 06a4f1216b Dead code removal 2019-08-09 19:29:28 +05:30
Prashant Singh fbedc8a161 Added env's shop_mail_from param param in all mails related to customers and shop 2019-08-06 20:00:28 +05:30
Prashant Singh 9ca97aa594 CMS implemented 2019-08-02 19:51:28 +05:30
Prashant Singh b1285fa243 Static page CMS sprint one complete, preview page is not loading CSS and JS from shop layout 2019-08-02 04:30:19 +05:30
Prashant Singh 9b0c3456e5 Modules preorder, customer document and group catalog updated 2019-07-30 16:22:27 +05:30
Prashant Singh c6bc5ba1c3 Added support for fixer for fetching rates 2019-07-15 18:24:36 +05:30
Prashant Singh d0b8a1f50f Added fixer-io api key provision in bagisto for exchange rated 2019-07-15 16:08:16 +05:30
Prashant Singh 88611c9d84 Fixed issue #1172 2019-07-11 09:49:32 +05:30
Prashant Singh b91d8a07d6 Added excluded usernames list so that illegal domain entries cannot be done 2019-07-08 17:32:12 +05:30
Prashant Singh bebf5e105b Base sync with github master 2019-06-27 13:11:48 +05:30
jitendra 2a5e8b1ddd Removed propaganistas/laravel-intl dependency 2019-06-27 13:01:47 +05:30
Prashant Singh 3382ffc076 Customer group catalog fixed 2019-06-24 19:23:20 +05:30
Prashant Singh c3bfcf5d79 Show price after login modified 2019-06-22 13:53:36 +05:30
Prashant Singh 6fd67e56d7 New repo with base sync 2019-06-22 01:02:33 +05:30
Prashant Singh 264d2e3c9e Added cart rule validation function which validates the cart rule and added unique coupon check while creating or updating couponable cart rule 2019-06-20 13:03:01 +05:30
Prashant Singh 9e80687960 Fixed customer group bug in cart rule and fixed a bug in coupon apply rule 2019-06-18 19:00:24 +05:30
Prashant Singh ea185aad7b Discount package bug fixes and complete refactor with overriding features for actions 2019-06-17 08:56:30 +05:30
rahul shukla 7b14de69c6 changes in config & composer 2019-06-13 14:56:04 +05:30
rahul shukla 1a84a016fa bulk add to cart 2019-06-11 16:22:01 +05:30
rahul shukla 8e37ebe7d5 conflict resolve 2019-06-10 17:13:30 +05:30
rahul shukla 80ac7bba72 customer document 2019-06-10 17:11:56 +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
jitendra 7a5c3f1bdc Assets compiled for production 2019-04-23 12:58:47 +05:30
jitendra e99daf28e2 Issue #834 fixed 2019-04-18 12:52:51 +05:30
Jitendra Singh 3984d92fad
Merge pull request #828 from prashant-webkul/development
Development
2019-04-16 15:46:32 +05:30
Jitendra Singh a031eabbf4
Merge pull request #829 from jitendra-webkul/jitendra
Issue #803 fixed
2019-04-16 15:41:39 +05:30
jitendra eb00f36835 Issue #803 fixed 2019-04-16 15:40:58 +05:30
Prashant Singh af88e8951a Unnecessary Tax models removed from core, were originally moved from core to Tax module 2019-04-16 14:39:30 +05:30
Prashant Singh ca7a5e4a6f Changed the moduleServiceProvider registration back in concord config file. 2019-04-15 16:37:25 +05:30
Prashant Singh 36f6c425c2 Assets compiled for production 2019-04-15 15:14:32 +05:30
Jitendra Singh ebc0befe6a
Merge pull request #813 from naresh-webkul/development
Development
2019-04-10 13:25:43 +05:30
jitendra f3f61e3c91 Optimized performance 2019-04-10 12:10:46 +05:30
naresh verma 642ef2b1c1 reverting config changes 2019-04-09 17:23:37 +05:30
naresh verma b0296a02e0 inventory source mail 2019-04-09 17:04:20 +05:30
jitendra fb6ffaa9d9 JWT implemented for customer api authorization 2019-04-09 16:27:33 +05:30
Prashant Singh 0f8e402380 added version in configuration of Bagisto 2019-04-04 13:03:53 +05:30
Prashant Singh 8af43eb5cc session expiration time now changed to 10 minutes to counter XSRF requests 2019-03-30 18:14:54 +05:30
rahul shukla 00ef14fd3c reverting translation chnages 2019-03-27 14:35:15 +05:30
rahul shukla d4d93739dc product zoom functionality added 2019-03-25 16:32:13 +05:30
rahul shukla dca138ae85 issue #724 2019-03-22 11:58:11 +05:30
jitendra 09a0db3e46 Fallback tranlation set to true in config file 2019-03-15 13:15:42 +05:30
Prashant Singh 20247136a0 disabled side menu toggle for admin, created configuration for product types 2019-03-11 18:39:42 +05:30
jitendra 70c114d3a6 Channel homepage content updated in seeder 2019-01-29 18:32:10 +05:30
Prashant Singh b19f02f5c0 UI issue fix in datagrid mass action master checkbox check and uncheck 2019-01-21 10:56:50 +05:30
Prashant Singh e2037c4892 datagrid's configuration dependency is removed and dynamic row format is back 2019-01-18 10:33:42 +05:30