Commit Graph

2323 Commits

Author SHA1 Message Date
Prashant Singh 316ec39aaf Configuration field changes done, data-vv-as parameter now take translated attribute from field configuration key called title 2019-07-09 11:18:02 +05:30
Prashant Singh 869265e7a5 Fixed the bug is system core configuration preventing to take null values inn the select and multi select fields 2019-07-09 10:11:19 +05:30
Prashant Singh 8c19d9e0ce removed dead code 2019-07-06 17:47:45 +05:30
Prashant Singh c8e8df1699 Added configuration for cart rules 2019-07-06 17:41:58 +05:30
Prashant Singh 3fe220428c Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-05 13:23:56 +05:30
Jitendra Singh 2a0d15d15a
Merge pull request #1150 from rahulshukla-webkul/development
Development
2019-07-04 14:40:12 +05:30
rahul shukla cfaee2f432 issue #1147 2019-07-04 13:56:18 +05:30
rahul shukla 9eb4b89344 json removed 2019-07-04 13:25:08 +05:30
rahul shukla 44a72db99e maximum price according to category 2019-07-04 13:20:21 +05:30
rahul shukla 60435b724f Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-04 12:38:36 +05:30
rahul shukla c56d94f7a4 issue #968 and dependent field 2019-07-04 12:38:20 +05:30
Prashant Singh f8d38e9bbd Enabled usage parameters of cart rule in create and edit form 2019-07-03 11:37:09 +05:30
Prashant Singh 12c321e80e Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-02 12:45:59 +05:30
Prashant Singh bfe52a7d3c Enabling coupon usage option for cart rules and start of the program convertxtoproductid 2019-07-02 12:45:30 +05:30
Jitendra Singh 47d375b264
Merge pull request #1146 from prateek-webkul/dev
change in Get root category
2019-07-01 18:12:18 +05:30
prateek srivastava 0e0cd7237a change in Get root category 2019-07-01 18:07:43 +05:30
Jitendra Singh e9608d87ef
Merge pull request #1143 from prashant-webkul/development
Development
2019-06-29 18:49:00 +05:30
Prashant Singh e0bbae7f8a Try catch handler in move to cart from wishlist 2019-06-29 18:47:22 +05:30
Prashant Singh be2b55a898 fixed event fire on movetocart from wishlist 2019-06-29 18:44:23 +05:30
Jitendra Singh 337c45426f
Merge pull request #1142 from rahulshukla-webkul/development
style for dashboard
2019-06-29 18:16:39 +05:30
rahul shukla 2f905203a2 style for dashboard 2019-06-29 18:12:07 +05:30
Jitendra Singh 842a0f77d4
Merge pull request #1141 from prashant-webkul/development
Added cart item add before event
2019-06-29 17:50:14 +05:30
Prashant Singh e3bc993c99 Added cart item add before event 2019-06-29 17:24:41 +05:30
Jitendra Singh 44af368b9c
Merge pull request #1139 from rahulshukla-webkul/development
css changes for overflow
2019-06-29 17:09:32 +05:30
Jitendra Singh 77af67ffd1
Merge pull request #1140 from prashant-webkul/development
Development
2019-06-29 17:09:19 +05:30
Prashant Singh ec2baa1be9 bug fix for event fire 2019-06-29 17:07:19 +05:30
Prashant Singh ff863fcc54 Added cart item add after event for move to cart from wishlist 2019-06-29 17:04:18 +05:30
rahul shukla b8c0f4aed6 css changes for overflow 2019-06-29 15:26:26 +05:30
Jitendra Singh 1700bf1aa2
Merge pull request #1135 from rahulshukla-webkul/development
Development
2019-06-28 17:52:12 +05:30
rahul shukla e6c20fa11e table in email template 2019-06-28 17:20:47 +05:30
rahul shukla 34fd4e3840 assets compile for production 2019-06-28 17:11:26 +05:30
rahul shukla 8e9768f947 assets compile for production 2019-06-28 17:08:30 +05:30
rahul shukla d5b66ebf9e table in email template 2019-06-28 17:05:08 +05:30
Jitendra Singh a2bf855fbe
Merge pull request #1136 from prashant-webkul/development
Updated changelog for release of stable version 0.1.6
2019-06-28 16:42:34 +05:30
rahul shukla beabada35e acl added for cart rule & dashboard css changes 2019-06-28 16:30:36 +05:30
Prashant Singh 8a5d57bcc6 new compiled assets for production 2019-06-28 16:30:36 +05:30
Prashant Singh fce7ec8586 Assets compiled for production and updated the changelog for new release v0.1.6 2019-06-28 16:29:41 +05:30
rahul shukla 0088bf7709 check in phone column unique removal 2019-06-28 15:44:17 +05:30
rahul shukla 7c8dc15c58 check in phone column unique removal 2019-06-28 15:43:53 +05:30
rahul shukla fdb9252b2a check for phone column & verrion last digit check in installer 2019-06-28 15:18:48 +05:30
Jitendra Singh 5514952c95
Merge pull request #1134 from prashant-webkul/development
Fixed conditions issue
2019-06-28 15:15:38 +05:30
rahul shukla 07ec9cd28a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-28 15:15:33 +05:30
rahul shukla fa65e46725 check for phone column & verrion last digit check in installer 2019-06-28 15:15:17 +05:30
Prashant Singh c4ec5853e2 Fixed conditions issue 2019-06-28 15:13:57 +05:30
Jitendra Singh f9f1f9d82e
Merge pull request #1133 from prashant-webkul/development
Development
2019-06-28 14:50:48 +05:30
Prashant Singh 5174c02bb0 Problem with does not contains condition is not fixed 2019-06-28 14:49:37 +05:30
Prashant Singh 35b8af8d47 Non argument fix for reset shipping 2019-06-28 13:29:39 +05:30
Jitendra Singh 338fd38fdd
Merge pull request #1128 from prashant-webkul/development
Apply to shipping and free shipping now added in normal flow
2019-06-28 13:00:41 +05:30
Prashant Singh a304795c36 Fixed issues with buy atleast 2019-06-28 12:59:40 +05:30
Prashant Singh e8dd4219a7 Apply on shipping working on cart rule 2019-06-28 12:57:19 +05:30