Commit Graph

2475 Commits

Author SHA1 Message Date
Prashant Singh 6d41d37c3b Catalog rules migrations finalized 2019-08-08 07:28:08 +05:30
Prashant Singh bb12e07212 Cart rules refactored 2019-08-08 05:53:28 +05:30
Prashant Singh fbedc8a161 Added env's shop_mail_from param param in all mails related to customers and shop 2019-08-06 20:00:28 +05:30
Prashant Singh 845f34038b Fixed bug in contains condition check 2019-08-06 16:24:35 +05:30
Prashant Singh 6a8bb7982d Base sync 2019-08-06 14:37:03 +05:30
Prashant Singh c661992a1a Non couponable rules refactoring 2019-08-06 14:06:25 +05:30
Prashant Singh c751c16e6a Cart rule refactorization 2019-08-05 19:38:17 +05:30
Prashant Singh cff0b7f4b2 refactroring of vart rules 2019-08-05 05:06:51 +05:30
Prashant Singh e4a5e84fb6 Refactoring cart rules 2019-08-03 19:54:02 +05:30
Prashant Singh 9ca97aa594 CMS implemented 2019-08-02 19:51:28 +05:30
Prashant Singh b1285fa243 Static page CMS sprint one complete, preview page is not loading CSS and JS from shop layout 2019-08-02 04:30:19 +05:30
Jitendra Singh 54e31bcb00
Merge pull request #1237 from rahulshukla-webkul/development
reverting changes, delete for product_attribute in product flat
2019-08-01 11:00:27 +05:30
rahul shukla 9ba2357d7c reverting changes, delete for product_attribute in product flat 2019-08-01 10:22:23 +05:30
Jitendra Singh 1403f93e79
Merge pull request #1236 from rahulshukla-webkul/development
issue #1235
2019-07-31 19:21:09 +05:30
rahul shukla 6f64de0f26 issue #1235 2019-07-31 19:19:26 +05:30
Jitendra Singh a38711df1a
Merge pull request #1227 from rahulshukla-webkul/development
product creation on channel based and admin logo
2019-07-31 17:57:26 +05:30
rahul shukla 561803cd3c filterable attribute for category, tax price update on cart and issue #1234 2019-07-31 17:44:29 +05:30
rahul shukla 3a7e481d01 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-30 20:09:55 +05:30
rahul shukla 270bdfa553 delete in product flat 2019-07-30 20:09:40 +05:30
rahul shukla 39139f26ca Issues #1228 and #1229 2019-07-30 13:45:13 +05:30
Jitendra Singh 9a211adaa4
Merge pull request #1207 from ArmCM/refactor/code_style
WIP - fix code style laravel
2019-07-30 11:49:27 +05:30
Jitendra Singh 41510db280
Merge pull request #1202 from moe2566/master
Add text direction configuration for locales
2019-07-30 11:48:56 +05:30
rahul shukla c73e12a052 try, catch for password reset. issue #1177 2019-07-30 10:50:05 +05:30
rahul shukla 1b95d3d877 product creation on channel based and admin logo 2019-07-30 10:36:26 +05:30
Jitendra Singh e6d40fa3f0
Merge pull request #1225 from rahulshukla-webkul/development
Development
2019-07-29 15:42:26 +05:30
rahul shukla b39f412842 issue #1217, #1220 and #1218 2019-07-29 14:44:38 +05:30
rahul shukla d83396d437 issue #1217, #1220 and #1218 2019-07-29 14:38:17 +05:30
rahul shukla 2e336c935a test field added for depandenet field in configuaration 2019-07-29 14:34:54 +05:30
rahul shukla 9d9b0b5176 use in product flat column added in attributes 2019-07-29 14:33:33 +05:30
Jitendra Singh ca763343c4
Merge pull request #1215 from rahulshukla-webkul/development
use in product flat added for attribute
2019-07-29 12:21:50 +05:30
rahul shukla dbff16b8b7 disabale zoom on mobile devices 2019-07-29 12:07:39 +05:30
Jitendra Singh a70f1f2b81
Merge pull request #1145 from adpe/adpe-patch-1
Rework and fix anchors in README
2019-07-29 11:01:17 +05:30
Adrian Perez c6f44daa22
Update README.md
Update the backers link and image
2019-07-28 15:34:57 +02:00
Jitendra Singh fdd681a4eb
Merge pull request #1213 from rahulshukla-webkul/development
Development
2019-07-25 11:32:28 +05:30
rahul shukla 120851ce0c Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-25 11:11:32 +05:30
rahul shukla fca1d6d15c filter code updated 2019-07-25 11:11:18 +05:30
Jitendra Singh 9fa5e2396b
Merge pull request #1210 from rahulshukla-webkul/development
Development
2019-07-25 10:04:14 +05:30
moe2566 09cfa77378
Update anonymous-master.blade.php 2019-07-24 10:19:50 -04:00
Prashant Singh 1a3038ae72 New cart rule actions 2019-07-24 19:32:37 +05:30
rahul shukla 13a982f480 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-07-24 18:51:03 +05:30
rahul shukla 29763b902e issue of image at checkout #1209 2019-07-24 18:50:44 +05:30
rahul shukla 1dd5faa21d change Datatype for code 2019-07-24 17:55:32 +05:30
ArmCM ae6c6fa193 WIP - fix code style laravel 2019-07-24 02:50:22 -05:00
Jitendra Singh 871bc8c190
Merge pull request #1205 from rahulshukla-webkul/development
assests compile for production
2019-07-24 12:39:48 +05:30
Jitendra Singh d37d5613c6
Merge pull request #1201 from HansSchouten/patch-1
Fix firing the wrong event after storing user
2019-07-24 11:30:08 +05:30
rahul shukla 97320b52ea assests compile for production 2019-07-24 10:40:51 +05:30
moe2566 e038416f55
Update 2019_07_23_033128_alter_locales_table.php 2019-07-23 19:22:03 -04:00
Moshe Lustigman a0ba845e37 Add text direction configuration for locales 2019-07-23 18:05:57 -04:00
Hans Schouten cfb4b8d682
Fix firing the wrong event after storing user 2019-07-23 21:59:28 +02:00
Prashant Singh 45ce843772 Cart rule new actions implementation 2019-07-23 18:23:49 +05:30