merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,327 Commits 1 Branch 0 Tags 196 MiB
Commit Graph

2327 Commits

Author SHA1 Message Date
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
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
Jitendra Singh 5514952c95
Merge pull request #1134 from prashant-webkul/development 
Fixed conditions issue
 2019-06-28 15:15:38 +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 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
Prashant Singh af100ac04e Merge branch 'master' of https://github.com/bagisto/bagisto 2019-06-27 16:20:29 +05:30
Jitendra Singh 4feeffaf51
Merge pull request #1124 from prashant-webkul/development 
Fixed issue #1080
 2019-06-27 16:18:13 +05:30
Prashant Singh 9b83fb8025 Fixed issue #1080 2019-06-27 16:14:24 +05:30
Prashant Singh 3e86f81681 Base sync with core master 2019-06-27 15:05:13 +05:30
Jitendra Singh 9eaf46a4d1
Merge pull request #1123 from prashant-webkul/development 
Product export now added
 2019-06-27 14:59:42 +05:30
Prashant Singh 487484f86d Product export now added 2019-06-27 14:55:32 +05:30
Jitendra Singh 4627c6a519
Merge pull request #1122 from prashant-webkul/development 
Development
 2019-06-27 14:43:51 +05:30
Jitendra Singh 561a2a763f
Merge pull request #1121 from rahulshukla-webkul/development 
Development
 2019-06-27 14:43:31 +05:30
Prashant Singh c245eab856 Fixed issue #1086 for customer edit 2019-06-27 14:41:01 +05:30
rahul shukla 79b5e1c4cd Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-27 14:38:48 +05:30
rahul shukla a9090e991c download for image & file type 2019-06-27 14:38:24 +05:30
Prashant Singh d1395ba145 Fixed issue #1086 2019-06-27 14:24:26 +05:30
Prashant Singh 3f79f2b89a Fixed issue #1114, #1112 2019-06-27 13:30:45 +05:30
Prashant Singh bebf5e105b Base sync with github master 2019-06-27 13:11:48 +05:30
Jitendra Singh fd06d6dc26
Merge pull request #1117 from jitendra-webkul/jitendra 
Removed propaganistas/laravel-intl dependency
 2019-06-27 13:03:12 +05:30
jitendra 2a5e8b1ddd Removed propaganistas/laravel-intl dependency 2019-06-27 13:01:47 +05:30
Jitendra Singh 367f1771a8
Merge pull request #1116 from prashant-webkul/development 
Added remove logic in coupon rule class
 2019-06-27 13:00:04 +05:30
Prashant Singh 5073226872 Added remove logic in coupon rule class 2019-06-27 12:58:41 +05:30
Jitendra Singh 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
Prashant Singh 64a6f06357 Cart rule guest issues and discount price not visible in cart summary is now fixed 2019-06-27 12:56:31 +05:30
Jitendra Singh 0102dd0c30
Merge pull request #1111 from prashant-webkul/development 
Development
 2019-06-27 11:45:23 +05:30
Jitendra Singh a90eff5ac7
Merge pull request #1110 from rahulshukla-webkul/development 
status for customer
 2019-06-27 11:45:14 +05:30
Prashant Singh 790bc2d7a4 Added the extra note on summary for stripe fees when customer is selected to pay stripe fees as transaction fees 2019-06-27 05:05:56 +05:30
Prashant Singh 9ba162e7a0 Critical bug fix in super admin security 2019-06-27 04:43:45 +05:30
Prashant Singh c539e017fe Merge branch 'master' of https://github.com/bagisto/bagisto 2019-06-27 04:38:41 +05:30