Commit Graph

3152 Commits

Author SHA1 Message Date
Prashant Singh 62a7954c33 cart rules working 2019-05-27 18:49:09 +05:30
rahul shukla b5eff8b47e issue #942 2019-05-27 18:25:30 +05:30
rahul shukla c4a9d04e72 file & image attribute 2019-05-27 16:51:27 +05:30
Prashant Singh 3bc27604b6 cart rule coupon implementation in progress for discount coupon in shop checkout pages 2019-05-27 16:30:55 +05:30
Prashant Singh f681397958 added helpers in cart and discount to apply rules on cart at checkout or not 2019-05-27 07:48:56 +05:30
Prashant Singh 6f14ad7a42 cart rule form completed 2019-05-27 03:59:37 +05:30
Prashant Singh 4ab1e86d98 designing process to get suitable discount rules 2019-05-24 20:07:58 +05:30
Jitendra Singh b215cd31db
Merge pull request #947 from jitendra-webkul/jitendra
Backorder implemented
2019-05-24 18:47:58 +05:30
jitendra 37ba923e9e Backorder implemented 2019-05-24 18:45:47 +05:30
Jitendra Singh d7c2ef3e6d
Merge pull request #944 from rahulshukla-webkul/development
Development
2019-05-24 17:18:17 +05:30
Prashant Singh 79ba3ebcf3 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-05-24 16:49:47 +05:30
Prashant Singh 22bafe1e11 base sync with master 2019-05-24 16:49:39 +05:30
Prashant Singh b354b4ce15 Models and Repositories updated for cart rule usage 2019-05-24 15:12:32 +05:30
Prashant Singh 41c8793f64 Cart rule form and migrations complete 2019-05-24 13:09:53 +05:30
rahul shukla b8561d4d5e schema condition in product flat table 2019-05-24 12:15:30 +05:30
rahul shukla 308b3be1d8 installer file deletion after install 2019-05-24 11:53:11 +05:30
Prashant Singh 4c844c12ce cart rule submission problem due to repository issue 2019-05-24 03:35:53 +05:30
Prashant Singh 9057f4bd48 added cart rule preferences for coupon codes 2019-05-23 19:04:15 +05:30
rahul shukla 7efcdefc6a changes in prouduct flat new migration 2019-05-23 18:49:29 +05:30
Prashant Singh bab740b4d9 added cart attributes and their conditions in cart rule form. Added migrations for cart rule coupons and related to it 2019-05-23 18:46:14 +05:30
Jitendra Singh 8323f3d783
Merge pull request #941 from jitendra-webkul/jitendra
Discount calculation added to the cart and discount added to the sale…
2019-05-23 18:45:22 +05:30
jitendra fb394d974c Discount calculation added to the cart and discount added to the sales views 2019-05-23 18:44:16 +05:30
Jitendra Singh 13e8e6ad37
Merge pull request #940 from jitendra-webkul/jitendra
Sales discount calculation implemented
2019-05-23 17:00:57 +05:30
jitendra edec481f26 Sales discount calculation implemented 2019-05-23 17:00:11 +05:30
Jitendra Singh abfb0fa102
Merge pull request #937 from rahulshukla-webkul/development
Development
2019-05-23 14:40:28 +05:30
rahul shukla de5952bc36 issue #939 2019-05-23 13:06:31 +05:30
rahul shukla 8678a865f0 column added in product flat table 2019-05-23 12:10:02 +05:30
Prashant Singh a4adcee26a added delete functionality for catalog rules 2019-05-22 20:46:47 +05:30
rahul shukla 2d85b90e81 weight unit added in configuration 2019-05-22 19:40:36 +05:30
rahul shukla 27812ccd15 shipping title & footer text 2019-05-22 18:45:47 +05:30
rahul shukla 5c6708c975 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-05-22 18:14:57 +05:30
Jitendra Singh d052523b9f
Merge pull request #936 from shaiv-webkul/development
config field for password
2019-05-22 17:55:28 +05:30
Prashant Singh 57dcce2366 catalog rule form complete, now moving towards catalog rule products 2019-05-22 17:21:31 +05:30
rahul shukla f434024827 change datatype of post code 2019-05-22 17:03:48 +05:30
shaiv-webkul acfdd0f880 config field for password 2019-05-22 16:11:45 +05:30
Jitendra Singh 698f7da6da
Merge pull request #930 from rahulshukla-webkul/development
issue #917 & #923
2019-05-22 12:10:32 +05:30
Prashant Singh 725b70ea19 catalog rule edit form complete 2019-05-22 04:42:24 +05:30
Prashant Singh 1e96a6bf36 catalog rule create complete, migrations changes, translations added 2019-05-22 03:56:06 +05:30
Prashant Singh f460de584c Merge branch 'development' of http://github.com/prashant-webkul/bagisto into development 2019-05-22 01:05:06 +05:30
Prashant Singh a798f3b081 Merge branch 'master' of http://github.com/bagisto/bagisto into development 2019-05-22 01:04:49 +05:30
rahul shukla 7888656d4c down icon & product edit icon 2019-05-21 20:11:36 +05:30
rahul shukla 30942b3d25 product page changes 2019-05-21 19:36:20 +05:30
Prashant Singh 479d99490d changed some migrations and data being populated at runtime inside catalog rule form 2019-05-21 19:25:43 +05:30
Prashant Singh 379af08993 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-05-21 19:21:56 +05:30
rahul shukla 84b60e9081 comment of phone field in customer 2019-05-21 18:07:54 +05:30
Prashant Singh e161394c73 Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development 2019-05-21 14:03:10 +05:30
Jitendra Singh d965e10e4b
Merge pull request #931 from jitendra-webkul/jitendra
Api added for address delete
2019-05-21 13:04:37 +05:30
jitendra 64fde804b4 Api added for address delete 2019-05-21 13:03:50 +05:30
Prashant Singh 66832c9a44 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-05-21 13:00:44 +05:30
Prashant Singh 35f0d48354 Merge branch 'master' of https://github.com/prashant-webkul/bagisto into development 2019-05-21 13:00:18 +05:30