Commit Graph

3152 Commits

Author SHA1 Message Date
Prashant Singh 930788212d Added preorder in acl 2019-06-29 12:53:28 +05:30
Prashant Singh f010b80cc2 Added StripeConnect and Customer Document in acl configuration 2019-06-29 12:50:57 +05:30
Prashant Singh 37409709ce Fixed dashboard arrow icon issue 2019-06-29 12:14:50 +05:30
Prashant Singh edc53c90f9 Fixed channel root category issue 2019-06-29 12:11:35 +05:30
Prashant Singh f526eb9337 Added the stripe transaction amount in cart before transacting using stripe and reducing it if payment fails. 2019-06-29 11:46:49 +05:30
Prashant Singh 04462c7212 Customer document updated 2019-06-29 11:40:58 +05:30
Prashant Singh d891fb108c Stripe Icon Added 2019-06-29 11:34:11 +05:30
Prashant Singh 51f0eec908 Added column in preorder datagrid and corrected the spelling in customer document 2019-06-29 11:05:58 +05:30
jitendra 55b71e1e66 updated 2019-06-28 19:48:52 +05:30
Prashant Singh c217598843 Ignored customer documents table from DBManager 2019-06-28 18:28:49 +05:30
Jitendra Singh 1700bf1aa2
Merge pull request #1135 from rahulshukla-webkul/development
Development
2019-06-28 17:52:12 +05:30
Prashant Singh f6f06d7a40 Updated credit max module 2019-06-28 17:22:17 +05:30
rahul shukla e6c20fa11e table in email template 2019-06-28 17:20:47 +05:30
Prashant Singh b00374fa81 Updated preorder package for customization 2019-06-28 17:20:19 +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
Prashant Singh baf104509b Updated the customer document module 2019-06-28 17:01:00 +05:30
Prashant Singh 794aac2c8e Merge branch 'master' of https://github.com/bagisto/bagisto 2019-06-28 16:57:17 +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
Prashant Singh ba8fb649e7 Merge branch 'master' of https://github.com/bagisto/bagisto 2019-06-28 16:33:08 +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
Prashant Singh 02faaf7415 Added reset shipping when applying coupon cart rule 2019-06-28 11:30:01 +05:30
Prashant Singh e4612d8629 Fixed some discrepancies in apply to shipping in cart rules 2019-06-28 10:56:44 +05:30
Prashant Singh 5e7201361c Merge branch 'development' of http://github.com/prashant-webkul/bagisto into development 2019-06-28 03:55:14 +05:30
Prashant Singh 4339475e70 CheckOnShipping method added to check where rule applies on shipping or not 2019-06-27 19:55:36 +05:30
Prashant Singh 25007824eb Shipping now getting applied according to selected shipping method 2019-06-27 19:51:17 +05:30
Prashant Singh 4db41973fd Removed the option of BuyAGetB as its current functionality was same as Fixed amount 2019-06-27 18:34:37 +05:30
Prashant Singh 216b409531 Apply to shipping and free shipping now added in normal flow 2019-06-27 17:09:56 +05:30
Jitendra Singh 3ab5e7dc70
Merge pull request #1126 from prashant-webkul/development
Development
2019-06-27 17:05:59 +05:30
Prashant Singh ec0277d3fb Some improvements in super admin panels for SAASModule 2019-06-27 16:58:57 +05:30
Prashant Singh e17da6fdfa Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-27 16:41:46 +05:30
Prashant Singh 5135ef5f34 Optimized validates discount class as it was creating redundancy with discount class 2019-06-27 16:40:57 +05:30
Jitendra Singh 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
Prashant Singh db12a1587f Fixed issue with cart rule validation when placing order 2019-06-27 16:27:06 +05:30