Commit Graph

2772 Commits

Author SHA1 Message Date
Sneh Sagar 67b296d2b5 Port number added to database connection 2019-09-05 21:03:39 +05:30
Jitendra Singh 538c40f535
Merge pull request #1397 from rahulshukla-webkul/development
Development
2019-09-05 16:46:58 +05:30
rahul shukla 11391b2fd8 conflict resolve 2019-09-05 16:45:39 +05:30
rahul shukla ddf754e2a7 Issue #1384 2019-09-05 16:41:26 +05:30
Jitendra Singh c4de6548dd
Merge pull request #1396 from ghermans/dusk
fixed #1367
2019-09-05 16:25:56 +05:30
Jitendra Singh 89d26e7313
Merge pull request #1395 from prashant-webkul/development
Development branches removed from composer dependencies
2019-09-05 16:13:53 +05:30
Glenn Hermans b3eb0b3f88
fixed #1367 2019-09-05 12:12:45 +02:00
Prashant Singh 70f3cf6219 Development branches removed from composer dependencies 2019-09-05 13:23:33 +05:30
rahul shukla 9916424e0d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-05 13:13:16 +05:30
rahul shukla c3d9ac8706 conflict resolve 2019-09-05 13:13:00 +05:30
Jitendra Singh be2d2608f7
Merge pull request #1393 from hChamran/patch-1
Fix #1392
2019-09-05 11:21:48 +05:30
Hossein f20dea46e4
Fix #1392 2019-09-05 09:33:08 +04:30
Jitendra Singh f9580b077a
Merge pull request #1390 from prashant-webkul/development
Changes in core repository made
2019-09-04 14:44:08 +05:30
Prashant Singh 6693a443d3 Removed latest flag check from prettus l5 repository 2019-09-04 14:00:45 +05:30
Prashant Singh 0468a1fdd6 Changes in core repository made 2019-09-04 13:36:34 +05:30
Jitendra Singh caaf210aa1
Merge pull request #1389 from prashant-webkul/development
Development
2019-09-04 11:42:45 +05:30
Prashant Singh c7f1e4996a Updated readme 2019-09-04 11:41:52 +05:30
Prashant Singh 0e51a9eab2 Changed minimum php version to 7.2 2019-09-04 11:39:20 +05:30
Prashant Singh ce79814408 Minor fix 2019-09-03 16:38:50 +05:30
Jitendra Singh 1171ae3220
Merge pull request #1386 from prashant-webkul/development
Reverting to original settings
2019-09-03 15:18:59 +05:30
Prashant Singh 0abb36b767 Removed dead code 2019-09-03 12:53:28 +05:30
Prashant Singh 5b563ca0d1 Reverting to original settings 2019-09-03 12:36:57 +05:30
Jitendra Singh 6231e7a331
Merge pull request #1383 from prashant-webkul/development
Development
2019-09-03 12:31:28 +05:30
Prashant Singh e7e2d6adbb Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development 2019-09-03 12:24:51 +05:30
Prashant Singh f1f0bcac8c Dead mods removed 2019-09-03 12:24:20 +05:30
Prashant Singh c6571c810b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-03 12:19:49 +05:30
Prashant Singh f77cf2263a sync 2019-09-03 10:30:02 +05:30
Prashant Singh 60413b252a Fixed issue #1379 2019-09-02 22:47:03 +05:30
Prashant Singh 34c14c17fc Merge branch 'development' of http://github.com/prashant-webkul/bagisto into development 2019-09-02 22:31:28 +05:30
Prashant Singh 4ecba193fc Merge branch 'master' of http://github.com/bagisto/bagisto into development 2019-09-02 22:31:14 +05:30
Prashant Singh 1c1961f2d2 Upgraded with Base and updated preorder 2019-09-02 19:58:18 +05:30
Prashant Singh 108795778b Merge branch 'master' of https://github.com/bagisto/bagisto 2019-09-02 19:53:25 +05:30
Prashant Singh 3794dc2e7c removed provider issues in GTM and Webfont 2019-09-02 19:52:39 +05:30
Prashant Singh ca3dfe804c Fixed issue #1380 2019-09-02 13:52:28 +05:30
Prashant Singh 5ad8e46a86 Catalog rule frontend implementation started 2019-08-31 20:37:28 +05:30
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