Prashant Singh
|
4bfefd3a07
|
base sync
|
2019-06-14 13:22:37 +05:30 |
|
Prashant Singh
|
c52238e45e
|
Cart rule frontend normalization
|
2019-06-14 13:21:17 +05:30 |
|
Prashant Singh
|
7f9409bd8e
|
Checkout and cart page now coupled with cart rules
|
2019-06-14 12:10:03 +05:30 |
|
Prashant Singh
|
e9a0588185
|
discount rule fixes
|
2019-06-13 22:19:44 +05:30 |
Jitendra Singh
|
6a093980bf
|
Merge pull request #1023 from rahulshukla-webkul/development
Development
|
2019-06-13 20:29:13 +05:30 |
rahul shukla
|
5afef79ac2
|
merge with master
|
2019-06-13 20:24:52 +05:30 |
|
rahul shukla
|
1a36cd32c7
|
change query for min price of variant
|
2019-06-13 20:22:16 +05:30 |
|
Jitendra Singh
|
b25a8656ff
|
Merge pull request #1022 from jitendra-webkul/jitendra
Jitendra
|
2019-06-13 19:49:49 +05:30 |
jitendra
|
6e8c0da054
|
Fixed conflicts
|
2019-06-13 19:48:30 +05:30 |
|
jitendra
|
806f8f71f6
|
Added discount amount to cart item
|
2019-06-13 19:34:13 +05:30 |
|
Jitendra Singh
|
d370821f7f
|
Merge pull request #1021 from prashant-webkul/development
Development
|
2019-06-13 19:31:53 +05:30 |
|
Prashant Singh
|
abf46c8a99
|
Added discount amount in cart item table
|
2019-06-13 19:30:00 +05:30 |
|
Prashant Singh
|
a27bae1c2d
|
All assets compiled for production
|
2019-06-13 19:08:42 +05:30 |
|
Prashant Singh
|
769f17a196
|
Fixed some syntax issue in cart rule controller
|
2019-06-13 19:00:33 +05:30 |
|
Prashant Singh
|
0aaf3d68e1
|
Ui package assets compiled for production
|
2019-06-13 18:20:09 +05:30 |
|
Jitendra Singh
|
72e56f4709
|
Merge pull request #1020 from prashant-webkul/development
added mass actions in admin customers grid
|
2019-06-13 18:10:05 +05:30 |
|
rahul shukla
|
7b14de69c6
|
changes in config & composer
|
2019-06-13 14:56:04 +05:30 |
|
rahul shukla
|
0fc78c5d83
|
Merge branch 'development' of https://github.com/rahulshukla-webkul/bagisto into development
|
2019-06-13 14:51:24 +05:30 |
|
Prashant Singh
|
d2e8e822d7
|
Fixed issue #1007
|
2019-06-13 12:51:18 +05:30 |
|
Prashant Singh
|
6c0ee913ed
|
added mass actions in admin customers grid
|
2019-06-13 12:47:58 +05:30 |
Prashant Singh
|
a0b14391fb
|
Merge pull request #1019 from prashant-webkul/development
Development
|
2019-06-13 06:38:41 +05:30 |
|
Prashant Singh
|
23467d9389
|
Added message when seller is blocked
|
2019-06-13 06:37:16 +05:30 |
|
Prashant Singh
|
c86a699f69
|
Added status check in customer auth session creation function
|
2019-06-13 06:34:46 +05:30 |
|
Prashant Singh
|
86e918b041
|
Merge pull request #1018 from prashant-webkul/development
Added status and notes in customer model fillables
|
2019-06-13 06:31:36 +05:30 |
|
Prashant Singh
|
619b8b6c8b
|
Added status and notes in customer model fillables
|
2019-06-13 06:28:29 +05:30 |
|
Prashant Singh
|
46e32e497e
|
Merge pull request #1017 from prashant-webkul/development
Development
|
2019-06-13 01:06:30 +05:30 |
|
Prashant Singh
|
ec27ed4c8d
|
added credit max in configuration
|
2019-06-13 01:05:29 +05:30 |
|
Prashant Singh
|
9a41904364
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2019-06-13 01:03:39 +05:30 |
|
Prashant Singh
|
4542c96b17
|
Fixed issue in core regarding buynow button passing static quantity as 1 is now removed
|
2019-06-12 15:16:06 +05:30 |
|
Prashant Singh
|
322205e28b
|
Merge pull request #1016 from prashant-webkul/development
added isset checks on admin dashboard causing some rendering issue wh…
|
2019-06-12 01:06:40 +05:30 |
|
Prashant Singh
|
76e43dcd58
|
added isset checks on admin dashboard causing some rendering issue while there was nothing to be evaluated
|
2019-06-12 01:05:24 +05:30 |
|
rahul shukla
|
6a8c7a8784
|
assests compile for production
|
2019-06-11 16:40:13 +05:30 |
|
rahul shukla
|
5b1f300abf
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2019-06-11 16:22:15 +05:30 |
|
rahul shukla
|
1a84a016fa
|
bulk add to cart
|
2019-06-11 16:22:01 +05:30 |
|
Prashant Singh
|
d26b4b5a72
|
Merge pull request #1012 from prashant-webkul/development
Development
|
2019-06-11 14:56:19 +05:30 |
|
Prashant Singh
|
22a81efdb3
|
fixed issue #1011
|
2019-06-11 14:51:28 +05:30 |
|
Prashant Singh
|
6b9be23cb0
|
fixed issue in cart rule for add condition button and exception while updating cart rule
|
2019-06-11 14:38:57 +05:30 |
|
Prashant Singh
|
359f5de7c9
|
Merge pull request #1008 from prashant-webkul/development
Development
|
2019-06-11 13:30:37 +05:30 |
|
Prashant Singh
|
de126e38ed
|
fixed issue with cart rule disc_quantity as validation was allowing zero at the time of creation
|
2019-06-11 12:32:34 +05:30 |
|
Prashant Singh
|
a7592b233d
|
Fixed bug #1003
|
2019-06-11 12:26:54 +05:30 |
|
Prashant Singh
|
64c249983d
|
Fixed
|
2019-06-10 18:28:17 +05:30 |
|
Prashant Singh
|
5689482fa0
|
Merge pull request #1002 from prashant-webkul/development
Fixed bugs in creation of cart rule form
|
2019-06-10 18:26:49 +05:30 |
|
Prashant Singh
|
8b5ac835e0
|
Fixed bugs in creation of cart rule form
|
2019-06-10 18:26:12 +05:30 |
|
rahul shukla
|
8e37ebe7d5
|
conflict resolve
|
2019-06-10 17:13:30 +05:30 |
|
rahul shukla
|
80ac7bba72
|
customer document
|
2019-06-10 17:11:56 +05:30 |
|
Prashant Singh
|
0c67e69bcc
|
Merge pull request #1000 from prashant-webkul/development
Fixed bug in cart rule form
|
2019-06-10 16:47:30 +05:30 |
|
Prashant Singh
|
e20e29b0bd
|
Fixed bug in cart rule form
|
2019-06-10 16:44:39 +05:30 |
|
Prashant Singh
|
71ce9e744d
|
Merge pull request #999 from prashant-webkul/development
disabled customer groups from cart rules
|
2019-06-10 16:42:18 +05:30 |
|
Prashant Singh
|
451000c0d5
|
disabled customer groups from cart rules
|
2019-06-10 16:41:31 +05:30 |
|
Prashant Singh
|
79731c7991
|
Merge pull request #998 from prashant-webkul/development
fixed validation issues in cart rule #993 & #997
|
2019-06-10 15:30:21 +05:30 |