Commit Graph

2278 Commits

Author SHA1 Message Date
rahul shukla c39255e254 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-13 14:35:29 +05:30
rahul shukla 5a54c02d50 Issue #1172 default payment & shipping method 2019-09-13 14:34:15 +05:30
prateek srivastava 98792912d8 translation added 2019-09-13 12:50:06 +05:30
prateek srivastava 9794fc659e Merge branch 'master' of https://github.com/bagisto/bagisto 2019-09-13 12:45:07 +05:30
Prashant Singh 685aedf528 getEligble items in action fixed as its was not working as boolean expression 2019-09-13 12:22:50 +05:30
Prashant Singh a7b2925db4 Fixed issue #1452 2019-09-13 11:01:54 +05:30
Jitendra Singh cdbd654f4f
Merge pull request #1451 from prashant-webkul/development
Development
2019-09-13 10:18:24 +05:30
rahul shukla 9eef8aed0a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-12 18:31:56 +05:30
rahul shukla 5fd72de3a9 Issue #1249 2019-09-12 18:31:40 +05:30
rahul shukla 1ac6650673 searching issue in datagrid 2019-09-12 16:53:05 +05:30
rahul shukla 61da74ee2b Issue #1447 2019-09-12 16:25:51 +05:30
Prashant Singh b089149268 Fixed issue #1428 2019-09-12 16:21:03 +05:30
Jitendra Singh 9a443b6f3b
Merge pull request #1446 from prashant-webkul/development
Command line installer fix
2019-09-12 15:52:58 +05:30
Prashant Singh 2c928ea25c Fixed issue #1288 2019-09-12 15:23:29 +05:30
prateek srivastava 7a50802144 issue #1442 fixed 2019-09-12 14:06:38 +05:30
Jitendra Singh e604037adf
Merge pull request #1445 from prashant-webkul/development
Fixed issue #1288 #1434 #1444
2019-09-12 11:14:27 +05:30
Prashant Singh d5bbc0230d Fixed issue #1288 2019-09-11 20:15:41 +05:30
Prashant Singh 6c82802371 Fixed issues #1444 & #1434 2019-09-11 20:10:59 +05:30
rahul shukla d9a0c6078e order number 2019-09-11 17:47:52 +05:30
rahul shukla aab8bd1479 order number 2019-09-11 17:34:11 +05:30
Jitendra Singh ac48a20822
Merge pull request #1343 from lemmeV/master
added configurable order numbers
2019-09-11 15:51:30 +05:30
jitendra e17c2c5f40 Merged with master 2019-09-11 15:23:57 +05:30
Jitendra Singh 8281ea0088
Merge pull request #1441 from rahulshukla-webkul/development
error in cancel mail
2019-09-11 13:57:41 +05:30
Jitendra Singh 3cd49daa5c
Merge pull request #1440 from prashant-webkul/development
Fixed a translation typo in create cart rule form
2019-09-11 13:57:35 +05:30
rahul shukla ce59e8b1d5 error in cancel mail 2019-09-11 13:55:07 +05:30
Prashant Singh e6104668e0 Fixed a translation typo in create cart rule form 2019-09-11 13:52:24 +05:30
Jitendra Singh 7c9d8a06ed
Merge pull request #1439 from prashant-webkul/development
Removed setInvoker method and allowed property to get set in Datagrid…
2019-09-11 13:47:01 +05:30
jitendra 484fb56e54 Price added to downloadable product links 2019-09-11 13:46:33 +05:30
jitendra 6384b84746 Resolve conflicts 2019-09-11 13:16:37 +05:30
Jitendra Singh b3ca0200ac
Merge pull request #1387 from codeinnovers/master
fixed issue  #1371
2019-09-11 13:13:13 +05:30
Prashant Singh d48fe8d435 Removed setInvoker method and allowed property to get set in Datagrid's constructor. 2019-09-11 12:59:51 +05:30
jitendra e250bc0602 Tax not getting applied if only order is placed for virtual product and downloadable product or for both. 2019-09-11 12:31:25 +05:30
jitendra 1ce4dfea95 Merge cart issue fixed for downloadable product 2019-09-11 11:21:12 +05:30
Prashant Singh b7d604ed31 Datagrid events unleashed 2019-09-11 03:18:32 +05:30
Prashant Singh 1e22e61282 Base sync 2019-09-11 03:11:55 +05:30
Prashant Singh 98e8f3c57d All datagrids are generating before add column, action and mass action 2019-09-11 03:10:38 +05:30
Prashant Singh 7d7cda1f73 Datagrid add column before and after event added 2019-09-11 01:32:35 +05:30
jitendra 128dde536e Fixed issues of bundle, downloadable products 2019-09-10 19:22:11 +05:30
Prashant Singh 69e46a7ddd Fixed translation issues in discount forms 2019-09-10 17:58:19 +05:30
jitendra b5163fe9b3 Fixed Not getting sample link for file if url is selected 2019-09-10 15:06:34 +05:30
Prashant Singh c3b54c389a Catalogrule form variables for json data encode and decode are now normalized 2019-09-10 14:54:47 +05:30
Prashant Singh b4872b5c21 Missed a ! symbol in conditions object's attribute validation 2019-09-10 14:42:59 +05:30
Jitendra Singh 60a24016e9
Merge pull request #1431 from rahulshukla-webkul/development
route check added for product flat update
2019-09-10 13:27:22 +05:30
rahul shukla 14773bbfa8 route check added for product flat update 2019-09-10 13:25:26 +05:30
Jitendra Singh 182c33305c
Merge pull request #1430 from rahulshukla-webkul/development
Development
2019-09-10 13:13:05 +05:30
rahul shukla 403a9dda4c wishlist icon is active when item is already in wishlist 2019-09-10 13:10:58 +05:30
Jitendra Singh 843fbb1922
Merge pull request #1422 from MattApril/master
Change 'self' references inside models to 'static'. This fixes issues…
2019-09-10 12:45:51 +05:30
Jitendra Singh a33a47753d
Merge pull request #1429 from prashant-webkul/development
Development
2019-09-10 12:45:16 +05:30
rahul shukla 599bffdce7 wishlist icon is active when item is already in wiahlist 2019-09-10 12:35:52 +05:30
jitendra 6f3b95811b Conflicts resolved 2019-09-10 12:29:19 +05:30
jitendra 98bd644e3e Created command for updated min_price and max_price based on special_price 2019-09-10 12:18:01 +05:30
Prashant Singh 6c03f824ec Refactoring in catalog rule form 2019-09-10 04:11:43 +05:30
Prashant Singh f99cb5588f Fixed issue #1428 2019-09-10 02:42:02 +05:30
rahul shukla f49e25ea1f Issue #1259 2019-09-09 18:34:02 +05:30
rahul shukla 8d578c3720 wrong grand total in invoice 2019-09-09 15:33:05 +05:30
jitendra 10b706c1d7 Merged with master 2019-09-09 14:46:43 +05:30
Jitendra Singh 9d5032d619
Merge pull request #1424 from rahulshukla-webkul/development
Development
2019-09-09 13:18:18 +05:30
rahul shukla 94727a4f1d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-09 12:57:44 +05:30
rahul shukla 98df7f25f7 Issue #1256 2019-09-09 12:57:28 +05:30
Prashant Singh 9c174202c3 Refactoring convertXToProductID 2019-09-08 07:12:06 +05:30
Matt April a8141c3fb3 Change 'self' references inside models to 'static'. This fixes issues when models are overriden, but he base class continues to references itself rather than the new model. 2019-09-07 20:14:27 -04:00
Prashant Singh 5651b4ed85 Cart rule form visual and translation changes 2019-09-08 02:50:11 +05:30
Prashant Singh 64f5bef341 Category filters : price filter was always active, turned active value to false 2019-09-08 01:37:04 +05:30
Prashant Singh 2efffafab1 Fixed translation issue in catalog rule delete notification 2019-09-07 18:59:04 +05:30
Prashant Singh 6a24ed723e Rogue statement found in discount amount initialization 2019-09-07 16:29:33 +05:30
jitendra 49ca240675 Duplicate product in cart issue fixed 2019-09-07 15:38:49 +05:30
rahul shukla 4d13c0586a Issue #1306 2019-09-07 15:18:24 +05:30
rahul shukla b5ef9526de Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-07 15:09:00 +05:30
rahul shukla 8ce93244de Issue #1263 2019-09-07 15:08:26 +05:30
Jitendra Singh dede76a442
Merge pull request #1416 from rahulshukla-webkul/development
changed in webpack
2019-09-07 13:30:02 +05:30
rahul shukla 9e8edfa226 changed in webpack 2019-09-07 13:27:54 +05:30
Prashant Singh 1aab4ccfe3 more normalization of cart rule form variables 2019-09-07 04:48:27 +05:30
Prashant Singh c190f6f230 Cart rule form variables normalized 2019-09-07 04:28:42 +05:30
jitendra 8545d5ef3c Unlimited download link issue fixed 2019-09-06 19:46:25 +05:30
jitendra 915fdd30c2 Fixed bugs 2019-09-06 19:38:54 +05:30
Prashant Singh 35d43b0b5a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-09-06 19:08:38 +05:30
Prashant Singh 047a34e76b Translation fixes and changes in cart rule datagrid 2019-09-06 19:04:57 +05:30
Jitendra Singh bb602ba9b2
Merge pull request #1409 from prashant-webkul/development
Fixes in checking json data of attribute conditions on server side
2019-09-06 18:50:47 +05:30
Prashant Singh 557a5b0143 Fixes in checking json data of attribute conditions on server side 2019-09-06 18:49:07 +05:30
Jitendra Singh 449f50ebfc
Merge pull request #1408 from prashant-webkul/development
JSON data parsing trimmed down from two levels to a single level in Cart rule update form
2019-09-06 17:15:41 +05:30
Prashant Singh 57f3cbb8af JSON parsing in cart rule update form fixes 2019-09-06 16:58:35 +05:30
Prashant Singh b1f0416ca0 Spell correction 2019-09-06 16:29:56 +05:30
jitendra d8403bf162 Fixed exchange rate exception 2019-09-06 15:48:59 +05:30
Jitendra Singh ea59825efe
Merge pull request #1407 from prashant-webkul/development
Edge case condition fixed in FixedAmount
2019-09-06 15:46:30 +05:30
Prashant Singh b3472204c7 Edge case condition fixed in FixedAmount 2019-09-06 15:24:15 +05:30
Jitendra Singh 22b24c4c6e
Merge pull request #1406 from rahulshukla-webkul/development
Development
2019-09-06 15:12:25 +05:30
rahul shukla 1cd6916c2b issue #1351 2019-09-06 15:11:21 +05:30
rahul shukla 6e32b928ac issue #1351 2019-09-06 15:08:17 +05:30
jitendra 0b22ca7ad1 Error added to accordian if closed 2019-09-06 14:00:10 +05:30
Prashant Singh 6ca065544c Edge case fix for Cart Rule actions 2019-09-06 13:46:20 +05:30
Prashant Singh c9cd73b67e Fixed edge case conditions and a bug in application of couponable rule 2019-09-06 13:38:05 +05:30
Prashant Singh 44c5ebc4f8 refactoring 2019-09-06 12:41:46 +05:30
Prashant Singh adad426228 missed a semicolon 2019-09-06 12:40:52 +05:30
Prashant Singh 2ac298cb68 Refactoring cart rule actions 2019-09-06 12:39:25 +05:30
Prashant Singh 5e47c5b2af More refactoring of discount assign to cart item 2019-09-06 12:37:46 +05:30
Prashant Singh 9c23179d6e Whole cart to fixed and whole cart to percent eligible items conditions corrected 2019-09-06 12:29:16 +05:30
jitendra 7b73abac95 Order view blade updated 2019-09-06 11:43:14 +05:30
Jitendra Singh 679cb01997
Merge pull request #1398 from rahulshukla-webkul/development
issue #1226
2019-09-06 11:16:18 +05:30
Prashant Singh 4a3bfd6e2c Refactored actions of cart rules 2019-09-06 05:45:16 +05:30
Prashant Singh 573aea9c75 Merge branch 'development' of http://github.com/prashant-webkul/bagisto into development 2019-09-06 03:05:40 +05:30
Prashant Singh 256556a872 Fixed issue #1391 2019-09-05 19:51:02 +05:30
jitendra aae2872085 Fixed typo error in Grouped type class 2019-09-05 19:30:17 +05:30
Prashant Singh 8a6b5d4723 Assets compiled for production 2019-09-05 18:37:58 +05:30
rahul shukla 7d9c785f7d issue #1226 2019-09-05 18:06:51 +05:30
jitendra 40b7126d1b Configurable qty issue fixed 2019-09-05 18:01:06 +05:30
jitendra 7952e57e41 Cart page css updated 2019-09-05 17:39:10 +05:30
jitendra 75e294e1c5 Cart page quantity changer updated 2019-09-05 17:31:09 +05:30
jitendra 0f2876a1da Conflict resolved in ChannelController 2019-09-05 17:01:17 +05:30
jitendra 7da7c93a79 Search products issue fixed 2019-09-05 16:58:55 +05:30
jitendra 27d3d3f93e Configuration product creation issue fixed 2019-09-05 16:50:16 +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 55fa22af6c Virtual product add to cart issue fixed 2019-09-05 15:36:28 +05:30
jitendra 38f73505af Assets compiled for production 2019-09-05 15:14:45 +05:30
jitendra 1977ddd6ad Bundle product radio and checkbox added in product edit form for is default selection 2019-09-05 13:56:10 +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 1afd2f9da3 Is default flag added to bundle product edit form 2019-09-05 11:19:33 +05:30
Hossein f20dea46e4
Fix #1392 2019-09-05 09:33:08 +04:30
jitendra 94290e6742 Option mission message added for configurable, group and bundle products during add cart 2019-09-04 17:33:55 +05:30
jitendra 55f888c1df Shop tranlation case fixed 2019-09-04 17:23:53 +05:30
jitendra 136c03ee3a Layered navigation price filter changed based on min_price and max_price 2019-09-04 16:52:38 +05:30
jitendra 3c5a2792e3 Removed configurable checks and deleted unwanted files 2019-09-04 16:23:05 +05:30
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
Sam 8c75c20e1d fixed issue #1371 2019-09-03 23:22:51 +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 f8cbdd488c Fixed issue #1366 2019-09-02 23:00:39 +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
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
Lemme Velleõu ed81e13d97 fixed suffix select 2019-08-23 10:10:40 +03:00
prateek srivastava 3e8d8bc7ab #1338 issue fixed 2019-08-23 12:13:18 +05:30
Lemme Velleõu 97817c3e5d added defaults to order number config 2019-08-23 09:34:12 +03:00
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
Lemme Velleõu 4f8f470095 added configurable order numbers 2019-08-22 18:24:30 +03:00
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
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
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 7352a97797 Bundle product data save completed 2019-08-21 19:24:26 +05:30
Prashant Singh 7a1b73f1c7 Cart rule action PercentOfProduct max discount quantity fixes 2019-08-21 17:26:23 +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