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

2772 Commits

Author SHA1 Message Date
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
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
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
Prashant Singh 0c79d87503 Removed stripe fees visibility from every where 2019-08-23 13:15:10 +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
Prashant Singh a30b16e9a0 Merge branch 'master' of https://github.com/bagisto/bagisto 2019-08-23 08:59:19 +05:30
Prashant Singh b62b277cac Integrated GTM 2019-08-23 08:56:25 +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
Prashant Singh 171b48453e Made cart rule conditions interpreter fault tolerant to missing attributes 2019-08-21 15:22:37 +05:30
Jitendra Singh 7cab5fd630
Merge pull request #1335 from prashant-webkul/development 
Development
 2019-08-21 15:14:02 +05:30
Prashant Singh 3b61c17155 Fixed issue #1333 2019-08-21 15:07:14 +05:30
Prashant Singh 140820dc4a Fixed issue #1334 2019-08-21 15:03:53 +05:30
Jitendra Singh 305c91554f
Merge pull request #1332 from prashant-webkul/development 
Added home page SEO under channel edit and create forms and fixed iss…
 2019-08-21 13:40:14 +05:30
Prashant Singh 05c5425c96 Added home page SEO under channel edit and create forms and fixed issue #1319 2019-08-21 13:38:07 +05:30