merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,785 Commits 1 Branch 0 Tags 196 MiB
Commit Graph

2000 Commits

Author SHA1 Message Date
jitendra 45f1ea4b83 Merge with master 2019-09-04 15:05:03 +05:30
jitendra 29ba0c28de Implemented bundle product price html 2019-09-04 14:58:39 +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
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 eafa585cb8 Order creation completed for bundle product 2019-09-03 15:46:13 +05:30
Prashant Singh 5b563ca0d1 Reverting to original settings 2019-09-03 12:36:57 +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 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 62d1b23a14 New issue template for filing issue and cut the issue filing hassle 2019-08-31 14:37:40 +05:30
jitendra 557cbb1db1 Bundle add to cart added 2019-08-30 17:09:15 +05:30
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
Karim Qaderi 46a40cc421
add event page checkout/success 2019-08-25 21:36:06 +04:30
Prashant Singh b2249e3a22 Header customized 2019-08-24 20:57:24 +05:30
Prashant Singh 940025eadc Added the seeders for cms pages which will generate the pages for the links present in footer's quick links section 2019-08-24 17:04:33 +05:30
Prashant Singh ca30234e0a Merge branch 'master' of https://github.com/bagisto/bagisto 2019-08-24 16:09:59 +05:30
Prashant Singh 8994cd0426 Base sync and webfont fixes 2019-08-24 16:09:22 +05: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 de1ccc7c0b Webfont changes 2019-08-23 19:04:18 +05:30
Prashant Singh 49c2f1c9d8 Slider content work complete 2019-08-23 18:01:44 +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