Commit Graph

934 Commits

Author SHA1 Message Date
jitendra 45f1ea4b83 Merge with master 2019-09-04 15:05:03 +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 108795778b Merge branch 'master' of https://github.com/bagisto/bagisto 2019-09-02 19:53:25 +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
Prashant Singh 1e0da3c42a Fixed issue #778 2019-08-29 16:11:12 +05:30
Prashant Singh 6709594889 Added a new type of field for color picker in configuration 2019-08-27 13:07:48 +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
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 49c2f1c9d8 Slider content work complete 2019-08-23 18:01:44 +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 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
prateek srivastava b0c8eb5eb5 issue of layout fixed in admin tax 2019-08-22 19:34:08 +05:30
prateek srivastava 5f34825678 issue of admin panel form button fixed 2019-08-22 19:28:41 +05:30
rahul shukla 486c6ca63f issue #1340 2019-08-22 13:56:21 +05:30
jitendra 7352a97797 Bundle product data save completed 2019-08-21 19:24:26 +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
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
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
Prashant Singh 3c9ae5b35d Fixed issue with category or attribute field left empty 2019-08-21 12:19:53 +05:30
Prashant Singh ec89315b42 Fixed issue #1324 2019-08-21 11:16:01 +05:30
Prashant Singh 56a1fd4593 Fixed issue #1312 2019-08-21 10:17:16 +05:30
jitendra ec567d624f Db schema, models and repositories added for bundle type product 2019-08-20 17:57:39 +05:30
Prashant Singh 3a9143462e Added asterisk in description fields of catalog rule update and create 2019-08-20 17:27:49 +05:30
Prashant Singh afafdfbfcd Fixed issue #1327 2019-08-20 16:48:11 +05:30
Prashant Singh 2a15488f24 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-08-20 16:47:00 +05:30
Prashant Singh 9d5793b7b5 Fixed issue #1326 2019-08-20 16:25:00 +05:30
Prashant Singh e52825a3f9 Fixed issue #1323 2019-08-20 16:10:24 +05:30
Prashant Singh 07be3c6a86 Fixed issue #1325 2019-08-20 16:07:41 +05:30
Prashant Singh 46e3badf4d Fixed issue #1275, #1321, #1285 2019-08-20 15:56:32 +05:30
Prashant Singh 01b9f5cbbc Fixed issue #1269 2019-08-20 13:33:24 +05:30
Prashant Singh 8cf6c41fc5 Fixed issue #1268 2019-08-20 13:31:59 +05:30
Prashant Singh a29409b1a4 Base sync 2019-08-19 16:11:09 +05:30
jitendra e2bd18e916 Resolved conflicts 2019-08-19 16:01:38 +05:30
Jitendra Singh e5b904741c
Merge pull request #1316 from prashant-webkul/development
Catalog rule implementation complete, new product price mechanish rem…
2019-08-19 15:11:13 +05:30
Prashant Singh e97069d2be Catalog rule implementation complete, new product price mechanish remaining 2019-08-19 15:05:56 +05:30
jitendra 29e4851bfb Group product added 2019-08-19 15:00:24 +05:30
Jitendra Singh b7bc6344bb
Merge pull request #1313 from prashant-webkul/development
Development
2019-08-19 13:56:04 +05:30