Commit Graph

867 Commits

Author SHA1 Message Date
Prashant Singh a29409b1a4 Base sync 2019-08-19 16:11:09 +05:30
Jitendra Singh 39a195f923
Merge pull request #1296 from prashant-webkul/development
Development
2019-08-14 14:55:44 +05:30
Prashant Singh de24f9a39c Fixed issue #1292 for CMS pages by making a separate view for helper classes and leaving future scope for things as well 2019-08-14 14:01:49 +05:30
Prashant Singh da5ad23c3b Fixed issue #1289 2019-08-14 13:50:32 +05:30
Prashant Singh c56a791069 Fixed issue #1295 2019-08-14 13:49:42 +05:30
Prashant Singh 54e54918a7 Fixed issue #1293 2019-08-14 13:44:21 +05:30
Prashant Singh 9425b39b78 Fixed issue #1294 2019-08-14 13:42:27 +05:30
Prashant Singh dd9ff1629d Fixed issue #1287 2019-08-13 23:31:14 +05:30
Hossein d875855145
Update app.php 2019-08-13 10:33:30 +04:30
Prashant Singh 2a36c6bd0e Catalog rule implementation in progress 2019-08-12 19:23:33 +05:30
Prashant Singh da093662db Catalog rule implementation in progress 2019-08-12 06:56:21 +05:30
Hossein 1b86cd99f1
Create Persian language file 2019-08-10 10:24:54 +04:30
Prashant Singh 06a4f1216b Dead code removal 2019-08-09 19:29:28 +05:30
Jitendra Singh a849ae9fc0
Merge pull request #1272 from prashant-webkul/development
Development
2019-08-09 19:12:44 +05:30
Prashant Singh 8b78105ed9 Removed dead code 2019-08-09 18:52:01 +05:30
Prashant Singh a72535db23 Merge branch 'master' of https://github.com/bagisto/bagisto 2019-08-09 14:17:09 +05:30
Prashant Singh 3ca4b48ac3 Catalog rule update form in progress 2019-08-09 04:10:45 +05:30
Prashant Singh 55ead412ce Catalog rule create form implemented 2019-08-08 11:38:23 +05:30
Prashant Singh 6d41d37c3b Catalog rules migrations finalized 2019-08-08 07:28:08 +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 6a8bb7982d Base sync 2019-08-06 14:37:03 +05:30
rahul shukla 063a58b753 Issue #1253 2019-08-05 21:00:39 +05:30
rahul shukla 763a380870 new customer notification, isssue #1247 2019-08-05 20:23:48 +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
rahul shukla 6f64de0f26 issue #1235 2019-07-31 19:19: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
Prashant Singh d8086091cb Merge branch 'master' of https://github.com/bagisto/bagisto 2019-07-30 13:54:25 +05:30
rahul shukla 39139f26ca Issues #1228 and #1229 2019-07-30 13:45:13 +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 1b95d3d877 product creation on channel based and admin logo 2019-07-30 10:36:26 +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
rahul shukla dbff16b8b7 disabale zoom on mobile devices 2019-07-29 12:07:39 +05:30
Prashant Singh f9e91bb0ef Merge branch 'master' of https://github.com/bagisto/bagisto 2019-07-25 11:26:34 +05:30
moe2566 09cfa77378
Update anonymous-master.blade.php 2019-07-24 10:19:50 -04:00
rahul shukla 1dd5faa21d change Datatype for code 2019-07-24 17:55:32 +05:30
Moshe Lustigman a0ba845e37 Add text direction configuration for locales 2019-07-23 18:05:57 -04:00
Prashant Singh 2acad0e540 Fixed an issue with convertXToProductId which was causing some productids from being pushed into the storage 2019-07-23 13:43:37 +05:30
Prashant Singh dfd6ea8c25 Translations fixes in promotions sections 2019-07-23 13:07:22 +05:30
Prashant Singh 70267e29cb disabled catalog rule 2019-07-22 13:01:54 +05:30
Prashant Singh 0bd422db97 translation fixes in cart rule forms 2019-07-22 13:01:07 +05:30
Prashant Singh 9cf1ea2516 disabled catalog rule till final migrations 2019-07-22 12:54:46 +05:30
Prashant Singh 896cbfe1e0 base sync 2019-07-22 12:53:51 +05:30
Prashant Singh 27ca4cb622 Minor fixes 2019-07-22 12:50:06 +05:30