02faaf7415
Added reset shipping when applying coupon cart rule
2019-06-28 11:30:01 +05:30
e4612d8629
Fixed some discrepancies in apply to shipping in cart rules
2019-06-28 10:56:44 +05:30
4339475e70
CheckOnShipping method added to check where rule applies on shipping or not
2019-06-27 19:55:36 +05:30
25007824eb
Shipping now getting applied according to selected shipping method
2019-06-27 19:51:17 +05:30
4db41973fd
Removed the option of BuyAGetB as its current functionality was same as Fixed amount
2019-06-27 18:34:37 +05:30
216b409531
Apply to shipping and free shipping now added in normal flow
2019-06-27 17:09:56 +05:30
e17da6fdfa
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-27 16:41:46 +05:30
5135ef5f34
Optimized validates discount class as it was creating redundancy with discount class
2019-06-27 16:40:57 +05:30
5bf6f30f4a
Merge pull request #1125 from prashant-webkul/development
...
Fixed issue with cart rule validation when placing order
2019-06-27 16:28:36 +05:30
db12a1587f
Fixed issue with cart rule validation when placing order
2019-06-27 16:27:06 +05:30
4feeffaf51
Merge pull request #1124 from prashant-webkul/development
...
Fixed issue #1080
2019-06-27 16:18:13 +05:30
9b83fb8025
Fixed issue #1080
2019-06-27 16:14:24 +05:30
9eaf46a4d1
Merge pull request #1123 from prashant-webkul/development
...
Product export now added
2019-06-27 14:59:42 +05:30
487484f86d
Product export now added
2019-06-27 14:55:32 +05:30
4627c6a519
Merge pull request #1122 from prashant-webkul/development
...
Development
2019-06-27 14:43:51 +05:30
c245eab856
Fixed issue #1086 for customer edit
2019-06-27 14:41:01 +05:30
79b5e1c4cd
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-27 14:38:48 +05:30
a9090e991c
download for image & file type
2019-06-27 14:38:24 +05:30
d1395ba145
Fixed issue #1086
2019-06-27 14:24:26 +05:30
3f79f2b89a
Fixed issue #1114 , #1112
2019-06-27 13:30:45 +05:30
fd06d6dc26
Merge pull request #1117 from jitendra-webkul/jitendra
...
Removed propaganistas/laravel-intl dependency
2019-06-27 13:03:12 +05:30
2a5e8b1ddd
Removed propaganistas/laravel-intl dependency
2019-06-27 13:01:47 +05:30
367f1771a8
Merge pull request #1116 from prashant-webkul/development
...
Added remove logic in coupon rule class
2019-06-27 13:00:04 +05:30
5073226872
Added remove logic in coupon rule class
2019-06-27 12:58:41 +05:30
e45fee03c6
Merge pull request #1115 from prashant-webkul/development
...
Cart rule guest issues and discount price not visible in cart summary…
2019-06-27 12:58:07 +05:30
64a6f06357
Cart rule guest issues and discount price not visible in cart summary is now fixed
2019-06-27 12:56:31 +05:30
0102dd0c30
Merge pull request #1111 from prashant-webkul/development
...
Development
2019-06-27 11:45:23 +05:30
3e4d2603c4
Apply to shipping and free shipping now enabled and provided support for multi currency cart rule discount
2019-06-27 04:35:26 +05:30
8a37088b9f
Omitted the applicable rules that gives 0 value discounts
2019-06-27 02:25:44 +05:30
7e8ae8022b
Some conditions changed according to end_other_rules attribute
2019-06-27 02:18:47 +05:30
72cf1c0226
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-27 01:36:18 +05:30
6d40b54d1d
Remote sync
2019-06-27 01:36:11 +05:30
c783ffa966
Added more checks for noncouponable and couponable rule interfaces
2019-06-27 01:32:32 +05:30
54fa3419f3
admin name for attribute
2019-06-26 21:03:52 +05:30
62cb90e014
status for customer
2019-06-26 18:02:14 +05:30
73d9966a12
Fixed issue #1108
2019-06-26 16:42:53 +05:30
9a92a61724
try & catch added in buynow
2019-06-26 16:40:15 +05:30
fe14287b07
Merge pull request #1106 from prashant-webkul/development
...
Development
2019-06-26 14:33:29 +05:30
00ba0f2e71
Fixed issue with guest checkout when looking for cart rules based on guest customer groups
2019-06-26 14:30:32 +05:30
02be744066
Removed is_guest check from couponable and non couponable rules
2019-06-25 15:36:41 +05:30
a60e339218
Merge pull request #1105 from prashant-webkul/development
...
Development
2019-06-25 15:02:46 +05:30
ddb2f1b59f
Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development
2019-06-25 14:57:57 +05:30
ecd766cb81
Some changes in frontend regarding coupon form on checkout
2019-06-25 14:57:26 +05:30
68c22f38f6
improvements in cart rules
2019-06-25 14:44:14 +05:30
44947074a4
added discount threshold check in fixed amount cart rule
2019-06-25 13:37:24 +05:30
35a87aa7fd
Added more security fixes for cart rules
2019-06-25 13:19:58 +05:30
463ff5a8ac
Fixed issues with cart rules and made a validation function that checks the applied rule for any changes made in cart
2019-06-25 13:14:12 +05:30
1a262e0f27
Fixed some bugs in cart rules
2019-06-25 12:27:13 +05:30
eedc0c6153
eliminated the column is_guest column from cart rules in favor of guest as a customer group
2019-06-25 11:10:21 +05:30
b0efd192e2
removed undefined variable rule from checkout/save payment
2019-06-24 18:03:31 +05:30
754d99d3ba
Merge pull request #1094 from rahulshukla-webkul/development
...
issue #1015 pagination responsive
2019-06-21 16:29:08 +05:30
d547ab5058
Merge pull request #1090 from prashant-webkul/development
...
Development
2019-06-21 16:28:59 +05:30
7d2b751479
issue #1015 pagination responsive
2019-06-21 16:17:37 +05:30
a35c997a56
issue #1014
2019-06-21 15:01:51 +05:30
ba26a39f74
issue #951
2019-06-21 14:41:22 +05:30
df57ef9f84
issue #1086
2019-06-21 12:05:37 +05:30
9080f1e278
removed inline css
2019-06-21 11:37:31 +05:30
b0c35ead9f
icon issue in admin dashboard
2019-06-21 11:23:27 +05:30
8c9fb32ab1
Removed some deadcode of productgrid repository which is no longer needed and had been obselete from many days
2019-06-21 04:15:45 +05:30
937d91ea5b
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-20 18:10:07 +05:30
12846df91c
quantity issue in discount
2019-06-20 17:49:14 +05:30
048585853d
repository insted of model in attribute create & edit for locale
2019-06-20 15:12:28 +05:30
bfac46ffdf
Merge pull request #1079 from rahulshukla-webkul/development
...
issue of discount amount in order #1053
2019-06-20 14:34:11 +05:30
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
f72529f0fb
issue of discount amount in order #1053
2019-06-20 12:17:11 +05:30
f1f7d03f6f
Merge pull request #1078 from rahulshukla-webkul/development
...
flash message for discount & error
2019-06-20 11:04:55 +05:30
d76d8bd129
flash message for discount & error
2019-06-19 21:18:16 +05:30
acad17af67
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-19 18:21:26 +05:30
052afb4faf
Fixed issues with apply to shipping and free shipping in create and edit of cart rules
2019-06-19 18:18:21 +05:30
423824b531
Fixed issue #1075 and #1074
2019-06-19 18:13:41 +05:30
144bda6590
review page render in onepage
2019-06-19 17:08:36 +05:30
5b98b9a86d
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-19 16:32:48 +05:30
be8c11aa98
issue #1069
2019-06-19 16:32:38 +05:30
de445279d2
Fixed bug in product creation changed the name of product type configuration file and implemented new design for condition fields in create and edit pages of cart rules
2019-06-19 16:27:32 +05:30
10e60dd4d7
Merge pull request #1071 from jitendra-webkul/jitendra
...
Fixed checkout summary refresh issue
2019-06-19 15:16:28 +05:30
aa1a5451bd
Fixed checkout summary refresh issue
2019-06-19 15:15:27 +05:30
d1c0be06ae
Cart rule coupons sync bugs fixed
2019-06-19 14:57:13 +05:30
8e648af885
Fixed issue #1003
2019-06-19 14:52:30 +05:30
bf6a6109f4
Fixed issue #1057
2019-06-19 11:16:01 +05:30
68e0ba1ac1
Fixed issue #1054
2019-06-19 10:58:02 +05:30
e404465cc7
Fixed an issue when only one cart rule was getting applied it was also returning db instance of cart rule with it
2019-06-18 20:16:51 +05:30
c2320410ab
cart rule issue fix
2019-06-18 19:17:16 +05:30
be62623022
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-18 19:16:14 +05:30
e0f93aae56
Fixed issue in cart rule actions
2019-06-18 19:14:49 +05:30
210be70779
Merge pull request #1049 from prashant-webkul/development
...
all calculations now changed to base price
2019-06-18 19:02:39 +05:30
9e80687960
Fixed customer group bug in cart rule and fixed a bug in coupon apply rule
2019-06-18 19:00:24 +05:30
d25cc60351
issues #1056 & 1058
2019-06-18 18:05:52 +05:30
9166daa31b
issues #1056 & 1058
2019-06-18 17:58:34 +05:30
3af3996439
buy now issue
2019-06-18 17:42:11 +05:30
bcdb4efb6c
Fixed a bug in application of cart rule
2019-06-17 18:48:54 +05:30
1144ce7e10
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-17 18:32:12 +05:30
94b67d00c1
admin css changes
2019-06-17 18:31:52 +05:30
0b5f50f1b0
depandent field added in configuaration
2019-06-17 18:22:23 +05:30
9c379f1ba4
Bug fix in cart rule
2019-06-17 16:22:18 +05:30
82d916c646
cart rule action percent of product changed to base price of item
2019-06-17 16:20:53 +05:30
d0c5589800
all calculations now changed to base price
2019-06-17 14:25:38 +05:30
4b99f5acf9
Summary template now re rendering on applying and removal of coupon
2019-06-17 14:16:51 +05:30
c2c0836b85
Couponable rule getting over ride by previously applied non-couponable rule
2019-06-17 13:09:21 +05:30
d18667351c
Base sync
2019-06-17 12:38:29 +05:30
b79e45ee7b
Clearing discount when applying or updating a new rule over current cart
2019-06-17 12:34:56 +05:30
f3437ee214
Fixed issues with discount as collect totals was not getting called on applying couponable rule
2019-06-17 12:33:34 +05:30
90c229442d
Fixed issues with testing criteria of cart rule conditions
2019-06-17 12:24:19 +05:30
ea185aad7b
Discount package bug fixes and complete refactor with overriding features for actions
2019-06-17 08:56:30 +05:30
b390d668f0
Added customer groups conditions in non couponable rules
2019-06-16 22:56:26 +05:30
ba31ecd527
Cart rule create and edit forms bug fixes
2019-06-16 22:18:19 +05:30
15abe379e0
Changed frontend attributes and syntax fixes in checkout
2019-06-16 17:26:06 +05:30
b93bc11c65
Fixed js error in checkout page
2019-06-15 22:28:21 +05:30
27b4ee19e5
Checkout coupon apply issue fixed
2019-06-15 22:22:40 +05:30
ba240925a4
Added v-debounce directive
2019-06-15 19:51:10 +05:30
a2d1e1aa85
Column 'code' added in customer_groups table
2019-06-15 18:50:38 +05:30
9ae4f8a801
Fixed issues with cart rule customer groups
2019-06-15 18:47:53 +05:30
1f5d8a8f28
Revert "Revert "Development""
2019-06-15 16:50:37 +05:30
545cd7386e
Revert "Revert "Fixed issue with order summary rendering on cart page""
2019-06-15 16:49:02 +05:30
d4d9c3e5ee
Revert "Revert "Added Guest default customer group with id 0""
2019-06-15 16:48:29 +05:30
1a15791f9d
Merge pull request #1039 from jitendra-webkul/jitendra
...
Reset changes
2019-06-15 16:47:36 +05:30
e3946a79dd
Reset changes
2019-06-15 16:46:55 +05:30
65f899dcfe
Merge pull request #1038 from jitendra-webkul/jitendra
...
Guest removed from customer pages
2019-06-15 16:35:42 +05:30
ff64d23319
Guest removed from customer pages
2019-06-15 16:34:56 +05:30
c06bc39a7f
Merge pull request #1037 from bagisto/revert-1033-development
...
Revert "Fixed issue with order summary rendering on cart page"
2019-06-15 15:13:43 +05:30
4427ec8205
Merge pull request #1036 from bagisto/revert-1028-jitendra
...
Revert "Added Guest default customer group with id 0"
2019-06-15 15:13:24 +05:30
ea3a08a198
Merge pull request #1035 from bagisto/revert-1029-development
...
Revert "buy now issue"
2019-06-15 15:13:16 +05:30
426cbe0ae5
Revert "Added Guest default customer group with id 0"
2019-06-15 15:10:11 +05:30
fb5687c451
Revert "buy now issue"
2019-06-15 15:10:10 +05:30
668f92185b
Revert "Development"
2019-06-15 15:10:04 +05:30
7ac715e93d
Revert "Fixed issue with order summary rendering on cart page"
2019-06-15 15:09:59 +05:30
0927786cee
Fixed issue with order summary rendering on cart page
2019-06-15 14:56:24 +05:30
eaa755bbea
Fixed discount on frontend
2019-06-15 13:13:07 +05:30
8d68be8e07
Rule condition discount calculation now working properly
2019-06-15 12:27:54 +05:30
fc43b158dd
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-15 10:49:04 +05:30
3a8b923f5c
Discount rule
2019-06-14 23:48:08 +05:30
076f197de7
buy now issue
2019-06-14 21:04:22 +05:30
c36950c609
applied translation string in apply coupon responses
2019-06-14 20:26:54 +05:30
0188644fce
Prepared standard responses when applying couponable rules
2019-06-14 20:04:32 +05:30
bb097be557
Added error message provision in the same when coupon application fails
2019-06-14 19:58:25 +05:30
bec9ebe7fb
coupon section fix in review-order component
2019-06-14 19:52:58 +05:30
1e865986c4
improved conditions check in applying cart rules
2019-06-14 19:24:15 +05:30
da82f2935c
removed some dead code
2019-06-14 17:55:03 +05:30
e26c2b4d89
Added Guest default customer group with id 0
2019-06-14 16:41:18 +05:30
3f814d9253
Fixed checkout issue
2019-06-14 15:13:20 +05:30
8fcca7363d
Merge pull request #1026 from jitendra-webkul/jitendra
...
Fixed checkout issue
2019-06-14 15:00:15 +05:30
5b81968bae
Fixed checkout issue
2019-06-14 14:59:29 +05:30
c8fb37698c
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-14 14:22:50 +05:30
0bdd03b331
ticket 201 error & admin css for back icon
2019-06-14 14:22:22 +05:30
4bfefd3a07
base sync
2019-06-14 13:22:37 +05:30
c52238e45e
Cart rule frontend normalization
2019-06-14 13:21:17 +05:30
7f9409bd8e
Checkout and cart page now coupled with cart rules
2019-06-14 12:10:03 +05:30
e9a0588185
discount rule fixes
2019-06-13 22:19:44 +05:30
5afef79ac2
merge with master
2019-06-13 20:24:52 +05:30
1a36cd32c7
change query for min price of variant
2019-06-13 20:22:16 +05:30
6e8c0da054
Fixed conflicts
2019-06-13 19:48:30 +05:30
806f8f71f6
Added discount amount to cart item
2019-06-13 19:34:13 +05:30
abf46c8a99
Added discount amount in cart item table
2019-06-13 19:30:00 +05:30
a27bae1c2d
All assets compiled for production
2019-06-13 19:08:42 +05:30
769f17a196
Fixed some syntax issue in cart rule controller
2019-06-13 19:00:33 +05:30
0aaf3d68e1
Ui package assets compiled for production
2019-06-13 18:20:09 +05:30
7b14de69c6
changes in config & composer
2019-06-13 14:56:04 +05:30
0fc78c5d83
Merge branch 'development' of https://github.com/rahulshukla-webkul/bagisto into development
2019-06-13 14:51:24 +05:30
d2e8e822d7
Fixed issue #1007
2019-06-13 12:51:18 +05:30
6c0ee913ed
added mass actions in admin customers grid
2019-06-13 12:47:58 +05:30
23467d9389
Added message when seller is blocked
2019-06-13 06:37:16 +05:30
c86a699f69
Added status check in customer auth session creation function
2019-06-13 06:34:46 +05:30
619b8b6c8b
Added status and notes in customer model fillables
2019-06-13 06:28:29 +05:30
ec27ed4c8d
added credit max in configuration
2019-06-13 01:05:29 +05:30
4542c96b17
Fixed issue in core regarding buynow button passing static quantity as 1 is now removed
2019-06-12 15:16:06 +05:30
76e43dcd58
added isset checks on admin dashboard causing some rendering issue while there was nothing to be evaluated
2019-06-12 01:05:24 +05:30
6a8c7a8784
assests compile for production
2019-06-11 16:40:13 +05:30
5b1f300abf
Merge branch 'master' of https://github.com/bagisto/bagisto into development
2019-06-11 16:22:15 +05:30
1a84a016fa
bulk add to cart
2019-06-11 16:22:01 +05:30
22a81efdb3
fixed issue #1011
2019-06-11 14:51:28 +05:30
6b9be23cb0
fixed issue in cart rule for add condition button and exception while updating cart rule
2019-06-11 14:38:57 +05:30
de126e38ed
fixed issue with cart rule disc_quantity as validation was allowing zero at the time of creation
2019-06-11 12:32:34 +05:30
a7592b233d
Fixed bug #1003
2019-06-11 12:26:54 +05:30
64c249983d
Fixed
2019-06-10 18:28:17 +05:30
8b5ac835e0
Fixed bugs in creation of cart rule form
2019-06-10 18:26:12 +05:30
8e37ebe7d5
conflict resolve
2019-06-10 17:13:30 +05:30
80ac7bba72
customer document
2019-06-10 17:11:56 +05:30
e20e29b0bd
Fixed bug in cart rule form
2019-06-10 16:44:39 +05:30
451000c0d5
disabled customer groups from cart rules
2019-06-10 16:41:31 +05:30
0d3539f3c9
fixed validation issues in cart rule #993 & #997
2019-06-10 15:29:19 +05:30
cfb16da64a
fixed issue #994
2019-06-10 15:21:45 +05:30
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
66bd3e7989
Optional index for datagrid action
2019-06-07 17:59:38 +05:30
5585b503cf
Car controller updated
2019-06-07 16:36:50 +05:30
ca4d9ef9ba
Fixed js issue buy now button not exist
2019-06-07 15:42:58 +05:30
c6a44b5414
Updated cart for custom_price
2019-06-07 11:18:46 +05:30
87542306a2
Merge pull request #980 from rahulshukla-webkul/development
...
Development
2019-06-07 11:14:43 +05:30
dc96dfb7b2
custom price default to null
2019-06-07 11:12:40 +05:30
f924e7ed01
custom price nullable in cart items
2019-06-07 10:06:00 +05:30
9bb3c2def9
Merge pull request #977 from rahulshukla-webkul/development
...
Development
2019-06-06 17:47:37 +05:30
796e76564c
Merge pull request #974 from imanghafoori1/clean_up_config
...
clean up
2019-06-06 17:47:10 +05:30
99ccac943d
fix bug
2019-06-06 16:25:06 +04:30
d399811206
Merge pull request #978 from jitendra-webkul/jitendra
...
totalQuantity function added to product and product flat model
2019-06-06 16:44:31 +05:30
2d00679901
totalQuantity function added to product and product flat model
2019-06-06 16:43:36 +05:30
af67516c36
object added with event
2019-06-06 15:16:16 +05:30
b7b42ffc15
translation updated
2019-06-04 18:25:54 +05:30
255664c4c0
back button implemented on checkout page
2019-06-04 16:36:42 +05:30
9f039cb9a5
clean up
...
- optimized imports
- remove unused variable
- extract a method
- flatten code
2019-06-04 14:45:16 +04:30
68e01e85c2
Merge pull request #971 from imanghafoori1/clean_up_dashboard
...
Clean up
2019-06-04 14:21:19 +05:30
d232722b5d
issue #916
2019-06-04 12:49:10 +05:30
40e8c85813
issue #945 product image of variant
2019-06-04 10:17:00 +05:30
Prashant Singh
Jitendra Singh
rahul shukla
jitendra
Jyoti Singh
Prashant Singh
imanghafoori