Commit Graph

1832 Commits

Author SHA1 Message Date
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 b0726eeefc fixed customer profile redirect parameter issue 2019-04-28 12:56:20 +05:30
Prashant Singh d74cef3326 added some corrections in category repository 2019-04-27 12:14:19 +05:30
Prashant Singh a0dd4b62cf Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-27 12:11:37 +05:30
Prashant Singh 63d1cf32f8 base sync with master 2019-04-27 12:11:25 +05:30
Jitendra Singh f63cb4deb5
Merge pull request #886 from rahulshukla-webkul/development
Development
2019-04-26 19:08:23 +05:30
rahul shukla 8d64ba656a option attribute in layred navigation & category changes 2019-04-26 19:06:18 +05:30
rahul shukla 2674fbb9ca issue #850 2019-04-26 15:31:01 +05:30
rahul shukla 47d2ac40dc Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-26 13:08:50 +05:30
Jitendra Singh 1c2a22c639
Merge pull request #883 from rahulshukla-webkul/development
issue #879
2019-04-26 12:44:44 +05:30
rahul shukla 23431e5083 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-26 12:44:38 +05:30
Jitendra Singh 34aeeac2d0
Merge pull request #884 from jitendra-webkul/jitendra
Jitendra
2019-04-26 12:44:24 +05:30
jitendra 10e92dada3 Now variant's super attributes values are saving in product_flat table 2019-04-26 12:43:42 +05:30
rahul shukla 0dca2370e9 issue #879 2019-04-26 11:27:41 +05:30
rahul shukla 8019f49765 issue #879 2019-04-26 11:18:15 +05:30
Jitendra Singh c4efa7b093
Merge pull request #878 from rahulshukla-webkul/development
Development
2019-04-25 17:53:09 +05:30
rahul shukla 5e6131102b issue #866 & #845 2019-04-25 14:11:49 +05:30
rahul shukla deb209d140 confirm box on delete 2019-04-25 13:05:35 +05:30
Prashant Singh 6abe59949f routes updated for creating discount rules 2019-04-25 02:33:09 +05:30
Prashant Singh f4413aaa00 Adding discount things inside promotions in admin 2019-04-25 02:12:50 +05:30
Jitendra Singh 35a3116178
Merge pull request #874 from rahulshukla-webkul/development
Development
2019-04-24 19:07:50 +05:30