Commit Graph

3152 Commits

Author SHA1 Message Date
rahul shukla 3486983b1d IE completed & redirect customer route 2019-05-08 17:52:54 +05:30
Prashant Singh 19f4de9489 new icons added for promotion and customer note. new action for customer added to take notes on the customers 2019-05-08 16:11:43 +05:30
Prashant Singh 3115722fc8 catalog rule form changed to muliti attribute set for single condition 2019-05-08 05:46:00 +05:30
rahul shukla 6f494cc04b IE changes 2019-05-07 21:09:27 +05:30
Prashant Singh a36776732b removed discounts table 2019-05-07 20:47:23 +05:30
rahul shukla e2120ea276 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-05-07 18:57:55 +05:30
rahul shukla b52dc978e8 Admin section for IE & dyanamic footer content 2019-05-07 18:57:33 +05:30
Jitendra Singh 2e57a12ac5
Merge pull request #905 from jitendra-webkul/jitendra
Fixed product repository search index issue
2019-05-07 17:57:53 +05:30
jitendra 0ff492ae80 Fixed product repository search index issue 2019-05-07 17:54:43 +05:30
Jitendra Singh 55752d21e3
Merge pull request #904 from jitendra-webkul/jitendra
Added api for front shop
2019-05-07 17:07:00 +05:30
jitendra a72d054cb5 Added api for front shop 2019-05-07 17:06:21 +05:30
Prashant Singh 8a7a142414 need another revisit on discount rules tables and then prepare for actions 2019-05-07 01:42:15 +05:30
rahul shukla b4a95b8d0c cart pages changes 2019-05-06 21:15:26 +05:30
rahul shukla 1b3653348d front end changes for IE 2019-05-06 20:52:43 +05:30
Prashant Singh 01acd092a4 working on prepopulating the values fields in conditions 2019-05-06 20:02:12 +05:30
Prashant Singh 2a2bcdb162 made some changes for custom validations used in ProductForm request class 2019-05-06 19:26:54 +05:30
Prashant Singh 5a2405c135 Made some dynamic form fields in catalog rule create form 2019-05-06 19:14:02 +05:30
rahul shukla 87b732898d add & remove at cart page 2019-05-06 13:06:16 +05:30
Prashant Singh a03d752185 catalog rule 2019-05-06 10:32:46 +05:30
Prashant Singh e2659f4dac catalog rule form underway 2019-05-03 19:14:38 +05:30
Prashant Singh 050271ded7 Fork sync 2019-05-03 09:43:08 +05:30
Prashant Singh cc3ed83f42 base sync 2019-05-03 09:42:35 +05:30
Prashant Singh 8c79bf4690 catalog rule form is underway 2019-05-03 02:25:55 +05:30
Jitendra Singh af8705d8e8
Merge pull request #900 from shenjiayu/development
utilise Mail::queue to send emails
2019-05-02 16:52:54 +05:30
Jitendra Singh 878a011f82
Merge pull request #901 from jitendra-webkul/jitendra
Added getPaymentMethods in Payment
2019-05-02 11:00:33 +05:30
jitendra 6b237b775d Fixed payment class conflict 2019-05-02 11:00:02 +05:30
jitendra 6121e5eefe Added getPaymentMethods in Payment 2019-05-02 10:55:59 +05:30
Prashant Singh 2eac48795c migrations for discounts complete 2019-05-02 01:05:33 +05:30
Jiayu Shen 2816dd01e5
Merge branch 'master' into development 2019-05-01 22:38:42 +10:00
Jitendra Singh 52bc554e31
Merge pull request #895 from prateek-webkul/development
admin mail notification, review price
2019-05-01 17:58:12 +05:30
shenjiayu 8eea13db2d utilise Mail::queue to send emails 2019-05-01 21:31:03 +10:00
Jitendra Singh 55662132dd
Merge pull request #898 from rahulshukla-webkul/development
Development
2019-05-01 12:04:40 +05:30
Prashant Singh fbee51a78e branch sync 2019-05-01 03:25:54 +05:30
Prashant Singh ece4f315e4 migrations for discount almost to be finished, final revision left 2019-05-01 03:23:54 +05:30
rahul shukla f942415ebb sort order for payment methods 2019-04-30 19:02:56 +05:30
rahul shukla db56e4b2df issue #814 2019-04-30 17:53:59 +05:30
rahul shukla ca08b9a133 rtl css chages for category 2019-04-30 14:48:43 +05:30
rahul shukla 46da666ace issue #767 2019-04-30 13:25:17 +05:30
prateek srivastava 4c101aa646 admin mail notification, review price 2019-04-30 12:55:11 +05:30
rahul shukla c635299861 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-30 12:40:49 +05:30
rahul shukla 507a41546d issue #890 2019-04-30 12:40:35 +05:30
Prashant Singh 7bd10c1a4a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-30 01:50:17 +05:30
Prashant Singh 78a7a59bba added cart and catalog rule routes to admin section 2019-04-30 01:50:09 +05:30
rahul shukla 577fc33610 issue #894 storage:link 2019-04-29 18:04:42 +05:30
Jitendra Singh 22e1ac57be
Merge pull request #893 from rahulshukla-webkul/development
Development
2019-04-29 15:53:26 +05:30
rahul shukla f841f16621 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-29 15:51:30 +05:30
rahul shukla cc3323c55d issue #891 description issue 2019-04-29 15:51:15 +05:30
Jitendra Singh a57c3e0ba7
Merge pull request #892 from jitendra-webkul/jitendra
price issue fixed
2019-04-29 15:42:13 +05:30
jitendra 5c68618416 price issue fixed 2019-04-29 15:41:31 +05:30
Prashant Singh b997302c37
Merge pull request #16 from prashant-webkul/development
Development
2019-04-28 13:00:47 +05:30