Jitendra Singh
|
04636229d8
|
Merge pull request #1377 from prashant-webkul/development
Current discount actions are normalized again with safe conditions im…
|
2019-08-31 18:20:26 +05:30 |
Prashant Singh
|
f8e9f37c5d
|
Current discount actions are normalized again with safe conditions implemented
|
2019-08-31 18:18:28 +05:30 |
|
Jitendra Singh
|
6158e8cd16
|
Merge pull request #1374 from prashant-webkul/development
Development
|
2019-08-31 18:02:26 +05:30 |
|
Prashant Singh
|
d31d9d9916
|
Isolation case for FixedAction in CartRule fixed
|
2019-08-31 17:59:00 +05:30 |
|
Prashant Singh
|
c19159ddc2
|
Validation case for cart rule fix, the rule was not getting deleted from cart and cartrulecart's table
|
2019-08-31 17:20:55 +05:30 |
|
Jitendra Singh
|
c131b47d6a
|
Merge pull request #1373 from prashant-webkul/development
Development
|
2019-08-31 15:34:47 +05:30 |
|
Prashant Singh
|
f78d9e8487
|
Fixed the issue #1372
|
2019-08-31 15:21:23 +05:30 |
|
Prashant Singh
|
484f1d7a93
|
ISSUE_TEMPLATE corrections
|
2019-08-31 14:39:47 +05:30 |
|
Prashant Singh
|
62d1b23a14
|
New issue template for filing issue and cut the issue filing hassle
|
2019-08-31 14:37:40 +05:30 |
|
Jitendra Singh
|
c69dd97498
|
Merge pull request #1368 from ghermans/master
Added laravel/dusk to dont-discover #1367
|
2019-08-30 15:24:18 +05:30 |
Glenn Hermans
|
2619623a24
|
Possible fix for #1367
|
2019-08-30 10:39:55 +02:00 |
|
Jitendra Singh
|
afefcefe9e
|
Merge pull request #1363 from prashant-webkul/development
Fixed issue #778
|
2019-08-29 18:45:21 +05:30 |
|
Prashant Singh
|
1e0da3c42a
|
Fixed issue #778
|
2019-08-29 16:11:12 +05:30 |
|
Jitendra Singh
|
d168dc1a09
|
Merge pull request #1359 from prashant-webkul/development
FixedAmount action class added provision to check more if rule's disc…
|
2019-08-27 14:54:07 +05:30 |
|
Prashant Singh
|
44aff5f761
|
FixedAmount action class added provision to check more if rule's disc is greater than item's then discount will be equal to item's price
|
2019-08-27 14:51:47 +05:30 |
|
Jitendra Singh
|
0b2d7d5da5
|
Merge pull request #1358 from prashant-webkul/development
The non attribute case of Cart rule action AdjustWholeCartToPercent w…
|
2019-08-27 13:32:05 +05:30 |
|
Prashant Singh
|
75ccc47923
|
The non attribute case of Cart rule action AdjustWholeCartToPercent was checking for product id and it didn't needed any product_id checks there.
|
2019-08-27 13:28:08 +05:30 |
|
Jitendra Singh
|
dc3fcd6180
|
Merge pull request #1357 from prashant-webkul/development
Added a new type of field for color picker in configuration
|
2019-08-27 13:24:51 +05:30 |
|
Prashant Singh
|
6709594889
|
Added a new type of field for color picker in configuration
|
2019-08-27 13:07:48 +05:30 |
|
Jitendra Singh
|
d87dba05b0
|
Merge pull request #1356 from prashant-webkul/development
Development
|
2019-08-27 10:49:03 +05:30 |
|
Prashant Singh
|
0e048f6dcb
|
Added the cms pages create and edit form in two separate accordian one for design and one for seo
|
2019-08-27 10:27:46 +05:30 |
|
Jitendra Singh
|
f3efed7cc3
|
Merge pull request #1354 from KarimQaderi/patch-4
add event page checkout/success
|
2019-08-27 10:18:51 +05:30 |
Karim Qaderi
|
46a40cc421
|
add event page checkout/success
|
2019-08-25 21:36:06 +04:30 |
|
Jitendra Singh
|
f5e8766c89
|
Merge pull request #1352 from prashant-webkul/development
Added entry for CMS in core's concord.php
|
2019-08-24 16:01:51 +05:30 |
|
Prashant Singh
|
a18bf91728
|
Merge branch 'master' of https://github.com/bagisto/bagisto into development
|
2019-08-24 15:59:15 +05:30 |
|
Prashant Singh
|
b570bf229b
|
CMS pages seeder implemented and now seeder generates all prebuilt pages that were listed in footer quicklinks
|
2019-08-24 15:57:09 +05:30 |
|
Prashant Singh
|
c856ef55ea
|
Added entry for CMS in core's concord.php
|
2019-08-23 16:43:53 +05:30 |
|
Jitendra Singh
|
6169d7cc8d
|
Merge pull request #1346 from prateek-webkul/master
#1338 issue fixed
|
2019-08-23 13:38:45 +05:30 |
|
Jitendra Singh
|
9b625dbb9f
|
Merge pull request #1345 from prashant-webkul/development
Development
|
2019-08-23 13:34:43 +05:30 |
|
Prashant Singh
|
5bc496d823
|
Changed column grand_total to base_grand_total in Order invoices datagrid
|
2019-08-23 13:32:20 +05:30 |
Prateek Srivastava
|
bd02f80a70
|
Merge pull request #3 from prateek-webkul/development
#1338 issue fixed
|
2019-08-23 12:15:16 +05:30 |
prateek srivastava
|
3e8d8bc7ab
|
#1338 issue fixed
|
2019-08-23 12:13:18 +05:30 |
|
Prashant Singh
|
a7d7bc80fa
|
Added some blade render events in settings
|
2019-08-23 10:38:59 +05:30 |
|
Prateek Srivastava
|
d0700d466c
|
Merge pull request #2 from prateek-webkul/development
issue of layout fixed in admin tax
|
2019-08-22 19:35:48 +05:30 |
|
prateek srivastava
|
b0c8eb5eb5
|
issue of layout fixed in admin tax
|
2019-08-22 19:34:08 +05:30 |
|
Prateek Srivastava
|
150d4f7342
|
Merge pull request #1 from prateek-webkul/development
Development
|
2019-08-22 19:30:46 +05:30 |
|
prateek srivastava
|
5f34825678
|
issue of admin panel form button fixed
|
2019-08-22 19:28:41 +05:30 |
|
Prashant Singh
|
fb52c4bffc
|
WIP: Frontend resolution of catalog rule pricing
|
2019-08-22 18:57:35 +05:30 |
|
Jitendra Singh
|
d36ae19c9a
|
Merge pull request #1342 from prashant-webkul/development
Development
|
2019-08-22 16:57:10 +05:30 |
|
Prashant Singh
|
c21ad00ece
|
Cart rules normalization complete
|
2019-08-22 16:54:25 +05:30 |
|
Prashant Singh
|
cf5cc40acb
|
Normalized cart action rules
|
2019-08-22 16:03:08 +05:30 |
|
Prashant Singh
|
5b33eb4a56
|
Fixed issue #1286
|
2019-08-22 15:59:54 +05:30 |
|
Prashant Singh
|
ee4c4c43cb
|
Fixed all actions of Cart rules
|
2019-08-22 15:18:27 +05:30 |
|
Jitendra Singh
|
c2719ac472
|
Merge pull request #1341 from rahulshukla-webkul/development
issue #1340
|
2019-08-22 14:18:39 +05:30 |
rahul shukla
|
486c6ca63f
|
issue #1340
|
2019-08-22 13:56:21 +05:30 |
|
Prashant Singh
|
852a6b91af
|
More normalization added in cart rule actions for FixedAmount & PercetnOfProduct
|
2019-08-22 11:05:25 +05:30 |
|
Jitendra Singh
|
828a76a5b3
|
Merge pull request #1337 from prashant-webkul/development
Cart rule action PercentOfProduct max discount quantity fixes
|
2019-08-21 17:51:57 +05:30 |
|
Prashant Singh
|
7a1b73f1c7
|
Cart rule action PercentOfProduct max discount quantity fixes
|
2019-08-21 17:26:23 +05:30 |
|
Jitendra Singh
|
5b6b6fbcb0
|
Merge pull request #1336 from prashant-webkul/development
Development
|
2019-08-21 16:46:50 +05:30 |
|
Prashant Singh
|
151c7a830a
|
Fixed issues related to empty attribute conditions
|
2019-08-21 16:10:39 +05:30 |