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

3152 Commits

Author SHA1 Message Date
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
Prashant Singh 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
Prashant Singh 8a37088b9f Omitted the applicable rules that gives 0 value discounts 2019-06-27 02:25:44 +05:30
Prashant Singh 7e8ae8022b Some conditions changed according to end_other_rules attribute 2019-06-27 02:18:47 +05:30
Prashant Singh 72cf1c0226 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-06-27 01:36:18 +05:30
Prashant Singh 6d40b54d1d Remote sync 2019-06-27 01:36:11 +05:30
Prashant Singh c783ffa966 Added more checks for noncouponable and couponable rule interfaces 2019-06-27 01:32:32 +05:30
rahul shukla 54fa3419f3 admin name for attribute 2019-06-26 21:03:52 +05:30
rahul shukla 62cb90e014 status for customer 2019-06-26 18:02:14 +05:30
Jitendra Singh 3317341a27
Merge pull request #1109 from rahulshukla-webkul/development 
try & catch added in buynow
 2019-06-26 17:00:49 +05:30
Prashant Singh 73d9966a12 Fixed issue #1108 2019-06-26 16:42:53 +05:30
rahul shukla 9a92a61724 try & catch added in buynow 2019-06-26 16:40:15 +05:30
Prashant Singh 1573ae5261 Added product export feature, to be migrated in core framework 2019-06-26 14:39:24 +05:30
Prashant Singh 397d83e64f Merge branch 'master' of https://github.com/bagisto/bagisto 2019-06-26 14:36:54 +05:30
Jitendra Singh fe14287b07
Merge pull request #1106 from prashant-webkul/development 
Development
 2019-06-26 14:33:29 +05:30
Prashant Singh 00ba0f2e71 Fixed issue with guest checkout when looking for cart rules based on guest customer groups 2019-06-26 14:30:32 +05:30
Prashant Singh 00bb4b0367 Preorder bug fixes 2019-06-25 17:08:52 +05:30
Prashant Singh 85ed096185 Fixes in customer document, removal of session from company facade 2019-06-25 16:56:57 +05:30
Prashant Singh 02be744066 Removed is_guest check from couponable and non couponable rules 2019-06-25 15:36:41 +05:30
Prashant Singh ead9f2d465 Merge branch 'master' of https://github.com/bagisto/bagisto 2019-06-25 15:04:41 +05:30
Jitendra Singh a60e339218
Merge pull request #1105 from prashant-webkul/development 
Development
 2019-06-25 15:02:46 +05:30
Prashant Singh af04acf76e Fixes in preorder 2019-06-25 15:00:34 +05:30
Prashant Singh ddb2f1b59f Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development 2019-06-25 14:57:57 +05:30
Prashant Singh ecd766cb81 Some changes in frontend regarding coupon form on checkout 2019-06-25 14:57:26 +05:30
Prashant Singh 68c22f38f6 improvements in cart rules 2019-06-25 14:44:14 +05:30
Jyoti Singh 44947074a4 added discount threshold check in fixed amount cart rule 2019-06-25 13:37:24 +05:30