Commit Graph

1339 Commits

Author SHA1 Message Date
Prashant Singh 17755bcc2d assets for the UI package compiled for production 2019-03-06 11:54:27 +05:30
rahul shukla c2ae22a262 merge with master 2019-03-05 18:35:44 +05:30
rahul shukla 76aa1da818 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-05 18:33:58 +05:30
rahul shukla 95c898c4a8 up-sell, cross-sell & related-product 2019-03-05 18:32:15 +05:30
Prashant Singh aac1c583f5 assets compiled for production 2019-03-05 16:32:12 +05:30
Prashant Singh 7ae4be56b8 fixed issue #642, made changes in layout of checkout section, various display bugs had been fixed 2019-03-05 16:28:55 +05:30
rahul shukla eb38784f7f Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-05 15:16:35 +05:30
rahul shukla 24faf854c5 up-sellling completed 2019-03-05 15:16:17 +05:30
jitendra 1079331358 Conflict fixed 2019-03-05 13:17:58 +05:30
jitendra 4c28aceab5 Product gallery selected thumbnail border color changed to brand color 2019-03-05 13:15:21 +05:30
JItendra Singh f7d8f726f7
Merge pull request #644 from prashant-webkul/development
changed address card class on onepage checkout
2019-03-05 10:55:11 +05:30
JItendra Singh c0dd164345
Merge pull request #648 from jitendra-webkul/jitendra
Excluded image swatch attributes from layed navigation
2019-03-05 10:54:38 +05:30
jitendra 70c4e69aaf Excluded image swatch attributes from layed navigation 2019-03-05 10:53:50 +05:30
rahul shukla ab9bf8ea97 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-04 10:11:39 +05:30
rahul shukla ca39b84d0b upsell product 2019-03-04 10:11:24 +05:30
Prashant Singh 54835099ba made the changes in checkout page by applying id attribute for all sections, so it would be easy for js to identify the section and usage of the script accordingly, the primary need was to add the id attribute on the continue button as it was needed for the section validation 2019-03-02 14:01:34 +05:30
Prashant Singh 9df1c291a6 Checkout's payment method front end rendering order function changed from unshift to push 2019-03-01 18:17:21 +05:30
Prashant Singh bce57ed750 changed address card class on onepage checkout 2019-03-01 11:21:53 +05:30
JItendra Singh 2c3d1d1096
Merge pull request #641 from prashant-webkul/development
Development
2019-03-01 11:08:37 +05:30
Prashant Singh 62f8cf1bad Fixed issue #642 2019-03-01 11:05:56 +05:30
JItendra Singh da73d59853
Merge pull request #643 from jitendra-webkul/jitendra
ACL issue fixed
2019-03-01 11:01:11 +05:30
jitendra e099492fd9 ACL issue fixed 2019-03-01 11:00:15 +05:30
Prashant Singh 543af40328 Issue in shipments grid is fixed 2019-02-28 16:29:46 +05:30
Prashant Singh d84cf69661 Fixed the issue #620 2019-02-28 16:24:10 +05:30
Prashant Singh ccea6689f1 address card list issue fix 2019-02-28 10:54:10 +05:30
Prashant Singh e2facbc329 All the color values have been converted into variables for shop package 2019-02-28 10:37:21 +05:30
JItendra Singh 674639a008
Merge pull request #640 from jitendra-webkul/jitendra
Jitendra
2019-02-27 20:30:44 +05:30
jitendra 876041aee4 Issue #639 fixed 2019-02-27 20:30:07 +05:30
jitendra efa2dd143b Issue #638 fixed 2019-02-27 20:10:04 +05:30
jitendra d05edec01e Color swatch issue fixed 2019-02-27 20:09:21 +05:30
JItendra Singh 56a413c37b
Merge pull request #637 from jitendra-webkul/jitendra
Shipment grid issue fixed
2019-02-27 19:18:07 +05:30
jitendra cceed7d048 Shipment grid issue fixed 2019-02-27 19:17:13 +05:30
JItendra Singh 73a3654773
Merge pull request #634 from jitendra-webkul/jitendra
Front review date format changed
2019-02-27 16:29:48 +05:30
jitendra ff37ad3c58 Front review date format changed 2019-02-27 16:29:03 +05:30
JItendra Singh 268ec5e425
Merge pull request #632 from prashant-webkul/development
Development
2019-02-27 14:46:24 +05:30
Prashant Singh bd5c88a29e eventbus events on checkout onepage 2019-02-27 14:28:50 +05:30
jitendra 570442ad3e Fixed cart controller issue 2019-02-27 13:07:27 +05:30
jitendra d7d8eb31a8 Increased datagrid deafult pages limit to 15 2019-02-27 12:27:07 +05:30
jitendra e5f1abe7a9 Product grid item per page increased to 20 2019-02-27 12:02:48 +05:30
jitendra 01f3cd7324 convertToBasePrice function added to Core class 2019-02-26 19:07:51 +05:30
jitendra 1ce5a957f9 convert price function issue fixed 2019-02-26 18:45:55 +05:30
Prashant Singh c5aceb72d0 event bus events added in onepage checkout for shipping and payments 2019-02-26 18:24:38 +05:30
jitendra 90540d445e Fixed swatch issue 2019-02-26 14:32:18 +05:30
rahul shukla c02d75774d rtl class removal 2019-02-26 14:18:42 +05:30
rahul shukla 724c81ffd7 conflict resolve 2019-02-26 14:13:07 +05:30
JItendra Singh 2775885b61
Merge pull request #625 from jitendra-webkul/jitendra
Added margin top on pagination
2019-02-26 13:14:59 +05:30
jitendra 71ddbacbd8 Added margin top on pagination 2019-02-26 13:14:18 +05:30
JItendra Singh 7ab9b2d6f7
Merge pull request #624 from jitendra-webkul/jitendra
Issue #588 fixed
2019-02-26 13:07:41 +05:30
jitendra 0f382acbf4 Issue #588 fixed 2019-02-26 13:06:51 +05:30
JItendra Singh 8394fc19ae
Merge pull request #623 from jitendra-webkul/jitendra
Issue #621 fixed
2019-02-26 13:00:35 +05:30
jitendra 4f420ca483 Issue #621 fixed 2019-02-26 12:59:58 +05:30
JItendra Singh 242b64afbf
Merge pull request #614 from prashant-webkul/development
Development
2019-02-26 11:56:43 +05:30
JItendra Singh c1d890ee56
Merge pull request #622 from jitendra-webkul/jitendra
Option swatches feature added
2019-02-26 11:55:42 +05:30
jitendra 0c84a9dcb2 Option swatches feature added 2019-02-26 11:55:00 +05:30
rahul shukla 35cdb1fd52 rtl css changes for admin 2019-02-25 19:05:45 +05:30
rahul shukla 7cfc0d3710 issue #618 & #619 & rtl css changes 2019-02-25 18:06:18 +05:30
Prashant Singh f79473a598 fixed issue #589 2019-02-25 09:45:12 +05:30
Prashant Singh 5e704a4979 more testcases for customer authentication 2019-02-23 17:23:46 +05:30
Prashant Singh 53094cadca Auth tests written 2019-02-23 16:13:24 +05:30
rahul shukla db0cd27c0d issue #615 2019-02-22 17:05:27 +05:30
Prashant Singh 3d94bfcd6e migration name changed according to current conventions 2019-02-22 16:25:49 +05:30
Prashant Singh 33a58daa35 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-22 16:15:16 +05:30
rahul shukla 3aacfc6acf admin name for attribute 2019-02-22 15:55:29 +05:30
Prashant Singh 8ebb6868c5 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-22 15:00:45 +05:30
rahul shukla 2da9f80bea issues #586 2019-02-21 18:40:43 +05:30
rahul shukla 19101afc18 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-21 16:36:45 +05:30
rahul shukla 59ecc0f019 guest review 2019-02-21 16:36:27 +05:30
JItendra Singh 491504a844
Merge pull request #609 from jitendra-webkul/jitendra
Issue #608 fixed
2019-02-21 15:02:49 +05:30
jitendra fd07499407 Issue #608 fixed 2019-02-21 15:01:44 +05:30
rahul shukla a7f545fcf4 issue #594 2019-02-20 19:11:46 +05:30
rahul shukla 2d62465d60 issues #596 and #597 2019-02-20 17:14:14 +05:30
rahul shukla be1de2d1ab assests compile 2019-02-20 14:46:44 +05:30
rahul shukla 63063e4602 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-20 14:44:45 +05:30
rahul shukla f2af7bc84a table css change 2019-02-20 14:44:18 +05:30
jitendra e2b411547d Issue #581 fixed 2019-02-20 14:30:54 +05:30
Prashant Singh 1f13298b65 base sync with master 2019-02-20 13:02:59 +05:30
jitendra a172a1c139 Fixed grid filter tags Ui 2019-02-20 12:51:55 +05:30
jitendra 5e4ab5dd8f Webpack mix files updated and assets compiled for production 2019-02-20 12:38:09 +05:30
jitendra cb4f1ce65a rtl added to body tag if locale code is ar 2019-02-20 12:17:40 +05:30
jitendra 37e605e489 Issue #585 fixed 2019-02-20 12:10:02 +05:30
jitendra 834ed4badc Issue #592 fixed 2019-02-20 12:06:53 +05:30
jitendra 3d5e2955a4 Issue #598 fixed 2019-02-20 11:57:06 +05:30
Prashant Singh 0e9e94683d Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-19 11:23:28 +05:30
rahul shukla 994da4a2b3 reverting changes of view 2019-02-19 10:07:13 +05:30
rahul shukla 22b19ec277 product image 2019-02-19 09:59:50 +05:30
Prashant Singh 1f30971c63 Fixed issue #592 2019-02-18 18:39:48 +05:30
Prashant Singh 4eb752cd10 Fixed issue #304 and some more changes 2019-02-18 17:21:04 +05:30
Prashant Singh 262bfbbd06 Fixed issue #304 2019-02-18 17:19:54 +05:30
rahul shukla 1a9c3d56c2 issue #587 & css changes 2019-02-18 17:01:53 +05:30
rahul shukla b019a248cf interfaces & proxy class implemented 2019-02-18 13:00:40 +05:30
rahul shukla 6172692954 assests compile & merge with master 2019-02-15 20:13:02 +05:30
rahul shukla 704f6851a3 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-15 20:10:58 +05:30
rahul shukla 36cb09bc58 address while checkout & reduces code 2019-02-15 20:10:47 +05:30
jitendra 7e20684c0f Issue Fixed (If product visiblity is set as false than products are showing on new and featured section) 2019-02-15 19:43:03 +05:30
jitendra d2f620bb9f Issue fixed (If configurable product added to cart without options) 2019-02-15 19:38:10 +05:30
rahul shukla d673b2a7b5 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-15 14:58:11 +05:30
rahul shukla 0330353e08 removal of default address 2019-02-15 14:58:00 +05:30
Prashant Singh f3cd11737c sync with base master 2019-02-15 13:28:52 +05:30
JItendra Singh 78cb14d0dd
Merge pull request #579 from jitendra-webkul/jitendra
Fixed view event issues
2019-02-15 13:07:59 +05:30
jitendra a03e5dc132 Fixed view event issues 2019-02-15 13:07:02 +05:30
JItendra Singh 62d3f4c9df
Merge pull request #578 from jitendra-webkul/jitendra
View event added to catalog pages
2019-02-15 12:54:24 +05:30
jitendra dda8b0bc92 View event added to catalog pages 2019-02-15 12:52:26 +05:30
rahul shukla 455f9442d4 conflict resolve 2019-02-15 11:35:45 +05:30
rahul shukla 05d3318cc8 assests compile 2019-02-15 11:32:00 +05:30
jitendra 15fe87d72c Assets compiled for production 2019-02-15 11:31:19 +05:30
rahul shukla 0b0f425bf4 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-15 11:29:05 +05:30
rahul shukla d7213db2c9 customer password 2019-02-15 11:28:47 +05:30
jitendra 3d0da8812d View event added on checkout payment and shipping section 2019-02-15 11:24:26 +05:30
Prashant Singh f68c4e482c Fixed bug #575 2019-02-15 09:51:38 +05:30
rahul shukla 7c72d6e3b1 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-14 21:20:33 +05:30
rahul shukla 4a648f549a checkout with multiple address #210 2019-02-14 21:20:10 +05:30
Prashant Singh 550cabcbcb Translation strings for datagrid and removal of dead code and pretty syntax 2019-02-14 19:24:44 +05:30
Prashant Singh 42b929bb22 admin user intended url functionality reverted 2019-02-14 18:20:04 +05:30
Prashant Singh 621455ed48 minor fixes 2019-02-14 17:57:07 +05:30
Prashant Singh 718a5eaa20 Resolved the issue #517 and removed the intented url from admin as admin don't require 2019-02-14 17:54:46 +05:30
Prashant Singh 63bac873c3 adding all get all channel functions in channel repo 2019-02-14 12:07:08 +05:30
Prashant Singh b28f48cf95 Confirm box implemented for datagrid actions 2019-02-13 19:10:23 +05:30
rahul shukla 77b9083d47 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-13 17:42:18 +05:30
rahul shukla e4bdf11a7d lang added 2019-02-13 17:42:07 +05:30
jitendra 77618d23f8 Assets compiled for production 2019-02-13 15:29:55 +05:30
Prashant Singh 3d9d61fafe UI fix in accordian 2019-02-13 15:18:21 +05:30
Prashant Singh 510ee89aad language meta tag added for storefront 2019-02-13 15:05:56 +05:30
Prashant Singh a745596ac8 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-13 14:53:44 +05:30
jitendra 35d0030633 Added config field infomation option 2019-02-13 14:51:51 +05:30
jitendra 5c4ab00f83 Fixed configuration repository select field issue 2019-02-13 13:11:31 +05:30
Prashant Singh 616d1bf160 merged with master 2019-02-13 11:40:56 +05:30
jitendra 98f3edc199 Assets compiled for production 2019-02-12 20:11:44 +05:30
rahul shukla 8b9edf9e7d marketplace responsive & installer 2019-02-12 16:46:55 +05:30
Prashant Singh 5ea84dff76 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-12 14:57:12 +05:30
Prashant Singh f38472d26b Accordian component's UX changed slightly according to new design guidelines 2019-02-12 14:56:56 +05:30
jitendra b979fc19e0 Assets compiled for production 2019-02-12 13:19:29 +05:30
rahul shukla e824f4741b assests compile 2019-02-11 18:12:06 +05:30
rahul shukla 15ae803407 merge with master 2019-02-11 17:18:06 +05:30
rahul shukla 1c16e2f2a9 validation for upload 2019-02-11 17:15:22 +05:30
jitendra 8c201f1bbb Issue #545 fixed 2019-02-11 15:35:02 +05:30
JItendra Singh 69ca02540b
Merge pull request #561 from jitendra-webkul/jitendra
Jitendra
2019-02-11 15:20:54 +05:30
jitendra 7bfb216bb0 Dashboard sql issue fixed 2019-02-11 15:13:38 +05:30
jitendra 2b382df075 Issue #532 fixed 2019-02-11 15:02:34 +05:30
Prashant Singh 7ba43a8fea Dead code removed from currency seeder and model 2019-02-11 13:31:05 +05:30
Prashant Singh e4dc9da03f Removed the currency symbol table migration and seeder 2019-02-11 13:19:49 +05:30
jitendra fa8aa2f66e Issue #556 fixed' 2019-02-11 13:03:17 +05:30
rahul shukla d1b14fa38e remove extra rendering & change in script 2019-02-08 19:39:05 +05:30
rahul shukla 446adfba0c backend validation for import 2019-02-08 17:24:48 +05:30
rahul shukla fdcf420af9 import for tax rate 2019-02-08 16:53:48 +05:30
Prashant Singh b72123db51 Currency symbol table implemented with relationship with currency as a fallback if the symbol for the currency is not found 2019-02-08 16:05:50 +05:30
Prashant Singh 4661e5b738 mass updated for product review updated for customer review datagrid 2019-02-08 15:46:43 +05:30
Prashant Singh 5584aa27a8 Disapproved functionality for customer review implemented 2019-02-08 15:44:00 +05:30
Prashant Singh af5f039cb9 category creation fix 2019-02-08 15:32:33 +05:30
Prashant Singh cd6d6c89a8 Fixed the issue #555 2019-02-08 13:02:25 +05:30
Prashant Singh 69aeb2a254 added a function to find the state by code and country code 2019-02-07 13:58:14 +05:30
Prashant Singh b1b39d2c74 Fixed issue #545 as Admins don't require intended url functionality only customers do 2019-02-06 18:49:59 +05:30
Prashant Singh de6507ff08 Fixed Issue #551 - Root Category Getting Deleted 2019-02-06 16:28:00 +05:30
jitendra 2fec94082c Fixed account menu issue 2019-02-04 20:32:06 +05:30
jitendra b0c96a0b02 Updated channel homepage content 2019-02-04 17:08:00 +05:30
JItendra Singh 0c7e4922ea
Merge pull request #542 from jitendra-webkul/jitendra
Assets compiled for production
2019-02-04 15:42:28 +05:30
jitendra f2f3592376 Assets compiled for production 2019-02-04 15:41:43 +05:30
JItendra Singh e02ae145df
Merge pull request #541 from rahulshukla-webkul/development
Development
2019-02-04 15:34:09 +05:30
Prashant Singh 6fe7167ecd assets compiled for production 2019-02-04 15:30:10 +05:30
Prashant Singh ad1b2c5f7c Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-04 15:29:33 +05:30
JItendra Singh 1a4a3c22e6
Merge pull request #539 from jitendra-webkul/jitendra
After login customer will redirect ti previous page
2019-02-04 15:28:38 +05:30
jitendra 8d3146e2d6 After login customer will redirect ti previous page 2019-02-04 15:27:49 +05:30
JItendra Singh b359957bc2
Merge pull request #538 from jitendra-webkul/jitendra
Jitendra
2019-02-04 15:24:03 +05:30
jitendra 35ccc65342 Fixed shipment grid shipped to column 2019-02-04 15:23:06 +05:30
rahul shukla 01d2d7cfcb Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-04 15:20:28 +05:30
rahul shukla a741e0e570 config changes 2019-02-04 15:20:15 +05:30
jitendra 49ddcd0256 Issue #191 fixed 2019-02-04 15:18:24 +05:30
Prashant Singh 8b3bf5a6ab assets compiled for product 2019-02-04 15:18:20 +05:30
Prashant Singh 8f78d8f2be issue #368 readdressed and same fix applied again after reviewal 2019-02-04 15:14:02 +05:30
JItendra Singh c304bb0781
Merge pull request #537 from jitendra-webkul/jitendra
Issues #353, #447, #530, #522 fixed
2019-02-04 14:57:10 +05:30
jitendra 639d4b1581 Issues #353, #447, #530, #522 fixed 2019-02-04 14:56:13 +05:30
Prashant Singh 072d61f20e Wishlist move to cart when product quantity is exhausted, showing improper validation message. Issue #402 fixed. 2019-02-04 13:51:26 +05:30
rahul shukla 1d83049a12 #531 2019-02-04 13:13:10 +05:30
rahul shukla 08fe30ac61 #523 and #519 2019-02-04 12:02:59 +05:30
rahul shukla 4c7f516313 responsive css 2019-02-02 20:45:25 +05:30
rahul shukla 7985c4c225 header resposive issue 2019-02-01 19:12:51 +05:30
jitendra 2438630be4 Assets compiled for production 2019-02-01 18:03:17 +05:30
JItendra Singh 461d594c6a
Merge pull request #527 from rahulshukla-webkul/development
Development
2019-02-01 17:23:46 +05:30
JItendra Singh c1e08f61e2
Merge pull request #526 from jitendra-webkul/jitendra
Flash css issue fixed
2019-02-01 17:13:32 +05:30
jitendra ffa97f2c55 Flash css issue fixed 2019-02-01 17:12:38 +05:30
rahul shukla 32777f3965 revert change 2019-02-01 17:12:19 +05:30
rahul shukla 317688ce38 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-01 17:06:45 +05:30
rahul shukla 745d6c1b48 responsive header menu 2019-02-01 17:06:32 +05:30
JItendra Singh 50df14c2de
Merge pull request #525 from jitendra-webkul/jitendra
Acl issue fixed for Configuration pages
2019-02-01 17:06:05 +05:30
jitendra 822d1b667c Acl issue fixed for Configuration pages 2019-02-01 17:05:19 +05:30
JItendra Singh 2d99b565b1
Merge pull request #509 from rahulshukla-webkul/development
configuration changes
2019-02-01 16:48:25 +05:30
mohdfaiz.dev cc4a88f271 Fixed issue #143 2019-02-01 16:24:39 +05:30
JItendra Singh c3e0f7acad
Merge pull request #518 from jitendra-webkul/jitendra
Fixed grid issues
2019-02-01 15:08:00 +05:30
jitendra cc6ca21447 Fixed grid issues 2019-02-01 15:07:11 +05:30
rahul shukla 557a7c0b01 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-02-01 12:31:45 +05:30
JItendra Singh 263f7ad92e
Merge pull request #516 from jitendra-webkul/jitendra
Jitendra
2019-02-01 12:20:19 +05:30
jitendra 2d1a816349 Issue #514 fixed 2019-02-01 12:19:30 +05:30
mohdfaiz.dev a881219f02 Fixed issue 513 2019-02-01 09:20:07 +05:30
jitendra 91b8bfeba2 Rating label fixed on product view page 2019-01-31 18:38:45 +05:30
jitendra 649f72087d Updated datagrid's item count 2019-01-31 17:36:43 +05:30
rahul shukla 41d3f74fc1 configuration changes 2019-01-31 17:04:32 +05:30
jitendra fcdf86eb73 Assets compiled for production 2019-01-31 15:23:53 +05:30
rahul shukla e00ca5808f Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-31 15:18:48 +05:30
rahul shukla ee91d69361 configuration changes 2019-01-31 15:18:36 +05:30
jitendra 29065eeba7 Currency switcher dropdown issue fixed 2019-01-31 12:29:35 +05:30
rahul shukla 7dae5da461 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-30 21:26:07 +05:30
rahul shukla 2f8178afc0 file & image field for configuration 2019-01-30 21:25:38 +05:30
jitendra bb635f1673 Fixed front header layout 2019-01-30 20:11:07 +05:30
jitendra 1241eff9a7 View event added in front header 2019-01-30 19:10:59 +05:30
jitendra 54f3f2f5b6 Items label added in order item table 2019-01-29 19:02:41 +05:30
jitendra e178217fce Assets compiled for production 2019-01-29 18:43:52 +05:30
JItendra Singh 118e9e89c5
Merge pull request #497 from prashant-webkul/development
Fixed issues, bugs and general enhancements.
2019-01-29 18:41:34 +05:30
jitendra b315babc8c Refactor product repository 2019-01-29 18:40:14 +05:30
jitendra 70c114d3a6 Channel homepage content updated in seeder 2019-01-29 18:32:10 +05:30
Prashant Singh af6e9351af Fixed issue #426 for the maintenance page was not working due to our own custom handler was not handling the HTTP exception 503 on an independent file 2019-01-29 18:25:42 +05:30
Prashant Singh be941760f8 fixed issue 398 for wrong flash notifications due to improper validations and removed the phone field from the customer as it was no longer available in the customers table 2019-01-29 17:08:02 +05:30
JItendra Singh ae4b1cebe2
Merge pull request #495 from rahulshukla-webkul/development
Development
2019-01-29 16:21:28 +05:30
jitendra 592f38b4ea Issue #396 fixed 2019-01-29 16:09:28 +05:30
jitendra 209f73d46b Issues #217, #396, #227, #321 2019-01-29 16:05:43 +05:30
Prashant Singh 3a69f76b96 Fixed issue #368 2019-01-29 16:05:30 +05:30
Prashant Singh ef1687b88c default sort order on the default index of the datagrids had beenh set to descending order 2019-01-29 13:44:27 +05:30
rahul shukla 36f98a8a4e issue #234 2019-01-28 17:05:06 +05:30
rahul shukla 9c934d8e8d issues #401 2019-01-28 15:04:45 +05:30
Prashant Singh e89a9ac930 Migration Fix 2019-01-28 14:01:49 +05:30
rahul shukla f624f910d7 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-25 21:28:35 +05:30
rahul shukla 70fed940a4 issue #438 2019-01-25 21:28:18 +05:30
jitendra f92594176a Paypal ipn issue fixed 2019-01-25 21:15:49 +05:30
jitendra 230f9ff988 Channel inventories seeder added 2019-01-25 20:51:24 +05:30
jitendra e1bd021e19 Assets compliled for prodcution 2019-01-25 20:19:13 +05:30
rahul shukla 96a10338dd merge with master 2019-01-25 20:13:08 +05:30
rahul shukla 6b762686a3 changes for installer 2019-01-25 20:11:35 +05:30
jitendra 7cf585c8da Fixed issue #390 2019-01-25 19:44:07 +05:30
jitendra 45c8bba4f5 Complied assets for production 2019-01-25 17:30:46 +05:30
jitendra 6fff4701a6 Flat rate implemented 2019-01-25 17:24:48 +05:30
rahul shukla 54377fd966 installer command differentilate according OS 2019-01-25 17:22:59 +05:30
rahul shukla 363efffaaa merge with master 2019-01-25 10:58:47 +05:30
rahul shukla e4592f85e8 header menu 2019-01-25 10:56:59 +05:30
rahul shukla 06108b4698 issue #395 & #261 2019-01-24 19:21:13 +05:30
rahul shukla 712c5bd5a7 installer 2019-01-24 11:03:11 +05:30
Prashant Singh 550f26f865 product flat implemented but needs some label attributes modifications and rigorous testing 2019-01-24 10:51:36 +05:30
Prashant Singh 604f9d7da5 Product flat create and update now both implemented 2019-01-23 17:08:17 +05:30
Prashant Singh 67dbce6fa8 Product flat implementation working, now binding it with the product update evento to write the 2019-01-23 16:35:34 +05:30
Prashant Singh 07daf7d310 product flat now showing up with relevant attributes data 2019-01-22 18:53:17 +05:30
Prashant Singh 810d5928c3 product flat all set with data structure with all the permutations of channels and locales now being recorded from the product attribute values 2019-01-22 18:25:47 +05:30
rahul shukla a269dc614f composer for installer 2019-01-22 16:13:56 +05:30
Prashant Singh f156511e97 merged with master 2019-01-22 10:35:05 +05:30
jitendra 5381f8ea8e Fixed 2019-01-21 17:18:39 +05:30
Prashant Singh 2172ac60dd fixed the issues with routes of actions in admin datagrids 2019-01-21 16:29:20 +05:30
jitendra 14730fe432 Category add link fixed 2019-01-21 16:19:38 +05:30
Prashant Singh 8f4093d49a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-21 15:53:28 +05:30
Prashant Singh f553dcdc71 assets compiled for production 2019-01-21 15:52:56 +05:30
jitendra dd36c2adf1 Seeder issue fixed 2019-01-21 15:51:28 +05:30
jitendra 42eb46e78c Asset compiled for production 2019-01-21 15:26:00 +05:30
Prashant Singh 6e2dad64de Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-21 15:20:52 +05:30
Prashant Singh ffe0f246b4 for alpha today 2019-01-21 15:20:01 +05:30
jitendra 61c10dd48d Category seeder added 2019-01-21 14:36:38 +05:30
Prashant Singh 3289ab8a4a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-21 12:39:36 +05:30
Prashant Singh b19f02f5c0 UI issue fix in datagrid mass action master checkbox check and uncheck 2019-01-21 10:56:50 +05:30
Prashant Singh 9eeaee1c66 migration changes in the product flat table 2019-01-19 15:35:12 +05:30
Prashant Singh 66c74af6ca attribute update event for product flat is suppressed for now as code and type never gets changed when updating the attribute 2019-01-18 18:56:46 +05:30
Prashant Singh 14dfec8365 attribute creation and deletion now syncing with columns of product_flat, label is now also creating when attribute type is select or multiselect 2019-01-18 18:49:51 +05:30
jitendra 33a75c306d Added view event manager to checkout and cart page 2019-01-18 18:16:05 +05:30
Prashant Singh 50a0a71196 product flat column creation and deletion on the basis of attributes 2019-01-18 17:36:58 +05:30
JItendra Singh e7c5c373e2
Merge pull request #474 from jitendra-webkul/jitendra
Inventory issue fix
2019-01-18 17:24:25 +05:30
jitendra 70a24a64b9 Inventory issue fix 2019-01-18 17:23:36 +05:30
JItendra Singh 71df0dea94
Merge pull request #473 from jitendra-webkul/jitendra
Issue #389 fixed
2019-01-18 16:49:58 +05:30
jitendra b418b27de3 Issue #389 fixed 2019-01-18 16:49:03 +05:30
JItendra Singh 63f141e3bd
Merge pull request #472 from jitendra-webkul/jitendra
Issues fixed
2019-01-18 16:41:22 +05:30
jitendra fbbf1fe99f Issues fixed 2019-01-18 16:40:40 +05:30
Prashant Singh bcb2661722 Datagrids display issue fixed when toggling massactions 2019-01-18 14:59:19 +05:30
Prashant Singh 0edebcf5c7 Table display issues when use mass actions filters and products flat events 2019-01-18 13:08:42 +05:30
JItendra Singh 871bf40d3a
Merge pull request #470 from jitendra-webkul/jitendra
Global Event bus added for vue
2019-01-18 13:05:32 +05:30
jitendra 00b9007d99 Global Event bus added for vue 2019-01-18 13:04:49 +05:30
rahul shukla 00ac9bbc01 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-18 12:06:34 +05:30
rahul shukla e2cfd0683c installer changes for windows 2019-01-18 12:05:53 +05:30
jitendra 4363dc17b2 Issue #457 fixed 2019-01-18 11:00:55 +05:30
jitendra c596ee8abe Extra new line removed from order repository 2019-01-18 10:48:25 +05:30
Prashant Singh e2037c4892 datagrid's configuration dependency is removed and dynamic row format is back 2019-01-18 10:33:42 +05:30
rahul shukla bd9ddfb0d7 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-17 20:22:20 +05:30
rahul shukla d50bb3e962 configuration message 2019-01-17 20:22:01 +05:30
jitendra 4488002522 Updated event code for order action 2019-01-17 17:29:07 +05:30
jitendra d19d57997e Added Order Cancel Event 2019-01-17 17:17:53 +05:30
Prashant Singh e7b2bdb72c sort issue fixed, will not work when false is passed 2019-01-17 16:51:59 +05:30
Prashant Singh 0e94d67a79 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-17 16:42:26 +05:30
jitendra 5130a640c1 Sub Total Column added to the order grid 2019-01-17 16:24:57 +05:30
Prashant Singh 83e44c75f5 mass action validation 2019-01-17 16:17:30 +05:30
Prashant Singh eb373d7ecb More changes in datagrid, regarding implementation of wrapper columns 2019-01-17 15:24:58 +05:30
rahul shukla bac0d48ab3 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-17 15:18:11 +05:30
rahul shukla e018d6555f export issue 2019-01-17 15:17:44 +05:30
Prashant Singh 25e485274e read me changes 2019-01-17 11:59:51 +05:30
Prashant Singh 1f3d84ed7e default index parameter corrected for some datagrids 2019-01-17 11:27:22 +05:30
Prashant Singh 4c3f70f60c datagrid mass selection issue is fixed when no checkboxes for record is checked then master checkbox is also automatically unchecked 2019-01-17 11:23:04 +05:30
Prashant Singh 30a2031867 Datagrid filters bug fix due to return statement used it was working on only first filter only 2019-01-17 11:14:28 +05:30
Prashant Singh 89ec9b5a9e bug fix for action and massaction in datagrid 2019-01-17 10:23:03 +05:30
JItendra Singh 9e3019f882
Merge pull request #460 from jitendra-webkul/jitendra
Now config field label will be tranlate
2019-01-16 20:08:43 +05:30
jitendra fb6a16596a Now config field label will be tranlate 2019-01-16 20:07:48 +05:30
Prashant Singh 342cbd5459 New filters type for price column added as numeric type 2019-01-16 20:02:00 +05:30
Prashant Singh 31f6e62bd0 a new type of column for price added 2019-01-16 19:57:45 +05:30
Prashant Singh 0776c8f331 width parameter in datagrid will now run as optional 2019-01-16 19:47:39 +05:30
Prashant Singh 6c9b381d4c Changes in datagrids 2019-01-16 19:19:37 +05:30
Prashant Singh e38763c126 Enable action and mass action will not bother whether implemented or not on the datagrid files 2019-01-16 16:53:19 +05:30
rahul shukla 8c32a21521 export changes 2019-01-16 16:43:36 +05:30
rahul shukla 4747f8fb59 customer design fixex 2019-01-16 14:08:39 +05:30
Prashant Singh e48ac7e295 datagrid sort and filter fixes 2019-01-15 18:55:50 +05:30
jitendra fc130dbcaa tinymce issue fixed 2019-01-15 18:16:16 +05:30
jitendra 575373cd75 Coding standard updated 2019-01-15 17:32:43 +05:30
jitendra aae6593469 Coding standard updated 2019-01-15 17:24:41 +05:30
JItendra Singh cedfeb034a
Merge pull request #452 from prashant-webkul/development
Development
2019-01-15 16:08:58 +05:30
Prashant Singh 976b29fe59 datagrid fixes 2019-01-15 16:07:06 +05:30
jitendra a781594b10 Translations added for menu and acl lables 2019-01-15 16:03:55 +05:30
Prashant Singh 0607a9e818 set index as abstract method changed to protected property 2019-01-15 16:00:26 +05:30
Prashant Singh 9aa55472ab Datagrid issue fixes 2019-01-15 15:47:13 +05:30
Prashant Singh 6e966384e5 Disabled customer email verfication and removed the phone field from the customer model 2019-01-15 13:03:41 +05:30
jitendra c0da6fbd73 Attribute family creation issue fixed 2019-01-14 19:41:34 +05:30
jitendra 6040e464fd Pagination count changed in all grids 2019-01-11 20:07:53 +05:30
jitendra ce2094d34c Asset compiled for production 2019-01-11 20:03:40 +05:30
Prashant Singh a2c02817f8 added labels to the filter tags 2019-01-11 19:55:44 +05:30
Prashant Singh 11fd8adfff pagination fixes in newly refactored datagrid 2019-01-11 18:35:25 +05:30
Prashant Singh 7785475eb9 mass actions enhanced and one bug remvoed causing value havoc 2019-01-11 17:23:36 +05:30
Prashant Singh 6d203fd8f6 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-11 16:56:10 +05:30
Prashant Singh 128e316265 pagination fixes 2019-01-11 16:55:10 +05:30
Prashant Singh 9b85622533 unnecessary code is removed 2019-01-11 15:42:34 +05:30
jitendra 34efd4d2c6 Assets compiled for production 2019-01-11 15:32:15 +05:30
jitendra 9c1612d0ab Assets compiled for production 2019-01-11 15:31:10 +05:30
Prashant Singh ca95d1d595 Variable names conflicts in body of datagrid causing view action to producce exception is fixed 2019-01-11 15:27:11 +05:30
rahul shukla f935937cbe Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-11 15:01:04 +05:30
rahul shukla dcb7029df2 validation changes 2019-01-11 15:00:44 +05:30
rahul shukla 64e52e5371 country & state issue 2019-01-11 14:54:03 +05:30
jitendra f1371fd6a0 Product inventory management updated 2019-01-11 14:51:20 +05:30
Prashant Singh 6f4aebe423 Datagrid enhancements and fault tolerant to column orders display and safe implementation of wrappers 2019-01-11 13:58:44 +05:30
rahul shukla 91c4a4205b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-11 10:40:06 +05:30
rahul shukla b7d15d4d0e validatio issue 2019-01-11 10:39:41 +05:30
Prashant Singh 436557fe81 minor changes in datagrid frontend templates 2019-01-10 18:54:35 +05:30
Prashant Singh 6c8bdf20c0 subtle changes in datagrid done and all datagrids have been refactored 2019-01-10 18:09:46 +05:30
Prashant Singh a4485e2191 merged with master 2019-01-10 11:54:17 +05:30
Prashant Singh 479341eaef all datagrids converted according to newly refactored pattern 2019-01-10 11:51:45 +05:30
Prashant Singh f5450cc516 Some fault tolerancy needs to be addressed before completing the refactoring 2019-01-09 17:11:00 +05:30
jitendra ab07518779 Order collect total function issue fixed 2019-01-09 13:27:43 +05:30
jitendra 25e5191581 Order collect total function issue fixed 2019-01-09 13:24:59 +05:30
Prashant Singh d55bd0e115 Datagrid refactoring styling is complete, only mass actions are needed to be implemnented along with wrappers and callbacks 2019-01-08 17:22:23 +05:30
Prashant Singh f7f4395c20 refactoring complete, now moving on to the mass actions refactoring in the datagrids and refactoring the existing grids 2019-01-08 16:32:39 +05:30
Prashant Singh dbc218243f Datagrid refactoring complete 95%, remaining with distincts and refactoring all grids according to the newly refactored method 2019-01-08 13:59:13 +05:30
Prashant Singh d68e14f12e datagrid refactoring completed to 80% 2019-01-08 13:00:20 +05:30
Prashant Singh 6d3bcca6f8 filters and sorts done, yet facing an issue url writing and decoding 2019-01-07 18:14:43 +05:30
jitendra ce06916b3a Cart issue fixed 2019-01-07 17:27:07 +05:30
jitendra 264e2b2a16 Cart item custom price implemented 2019-01-07 16:40:26 +05:30
jitendra 239d151887 Cart add event code updated 2019-01-07 16:11:11 +05:30
jitendra 16cb592130 Event added to cart 2019-01-07 16:00:28 +05:30
Prashant Singh 926158cc0d datagrid refactored from backend to frontend, remaining is filters, sorts and searches to be refactored into vue components 2019-01-07 13:37:35 +05:30
jitendra b388dc9aa6 Assets compiled for production 2019-01-04 19:24:03 +05:30
rahul shukla 1e2d7418ca merge with master 2019-01-04 19:13:53 +05:30
rahul shukla 90262c14c0 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-01-04 19:13:33 +05:30
jitendra e2765b2e1c Review view updated 2019-01-04 19:09:27 +05:30
rahul shukla 33ac4c1319 multiselect for configuration 2019-01-04 11:13:24 +05:30
Prashant Singh cb0a50233c Datagrid now fault tolerant on not passing select key in its configuration 2019-01-03 16:54:13 +05:30
Prashant Singh 7117038287 datagrid operator bag dependency removed , now operators are already there in Datagrid classes 2019-01-03 15:43:47 +05:30
Prashant Singh 2b32a6252e black listing some key parameters from the request bag and server bag and post bag 2019-01-03 14:53:01 +05:30
rahul shukla b430d4d4b5 merge with master 2019-01-02 20:15:05 +05:30
rahul shukla 0bf6699746 issues fixes #320 #288 #309 2019-01-02 20:12:49 +05:30
jitendra 98e2d0e52c Merged with master 2019-01-02 20:07:00 +05:30
jitendra 6ae9dbaef4 Issue fixed 2019-01-02 20:05:11 +05:30
rahul shukla 29ab4f1da9 merge with master 2018-12-31 18:51:42 +05:30
JItendra Singh 9eabca881f
Merge pull request #423 from jitendra-webkul/jitendra
Channel alter migration issue fixed
2018-12-31 18:49:50 +05:30
jitendra c49e7b6e5f Channel alter migration issue fixed 2018-12-31 18:49:06 +05:30
rahul shukla 96b7f05c23 bagisto installer , #399 #400 #382 #301 #344 #214 #359 #223 #138 issue fixed 2018-12-31 17:27:32 +05:30
JItendra Singh 4e89ce082e
Merge pull request #422 from jitendra-webkul/jitendra
Channel root category feature added
2018-12-31 16:35:50 +05:30
jitendra cb3da5fc08 Channel root category feature added 2018-12-31 16:34:26 +05:30
JItendra Singh e387cec43f
Merge pull request #420 from jitendra-webkul/jitendra
Moved catalog event from controllers to repositories
2018-12-27 18:59:41 +05:30
JItendra Singh 27d3f517fe
Merge pull request #419 from jitendra-webkul/jitendra
Removed auth middleware from controllers
2018-12-27 18:58:56 +05:30
jitendra abd3bba617 Moved catalog event from controllers to repositories 2018-12-27 18:57:39 +05:30
jitendra 9581082f56 Removed auth middleware from controllers 2018-12-27 17:05:05 +05:30
Prashant Singh 0d64d96c9c Merge branch 'master' of https://github.com/prashant-webkul/bagisto into development 2018-12-27 16:29:57 +05:30
Prashant Singh 0a2a6c4234 conflicts in class attribute of storefront search and datagrid's search box 2018-12-27 16:22:44 +05:30
jitendra fec802b4af Changed registration page input tag to button 2018-12-27 13:03:54 +05:30
jitendra 336284ee6e Refactor state grouping by country 2018-12-27 11:35:10 +05:30
jitendra de90ab1d6a Per unit and per order feature added in Flatrate shipping 2018-12-26 19:33:01 +05:30
jitendra 6b2b054f97 Get config for shipping and payment method updated 2018-12-26 18:52:44 +05:30
jitendra 0b3ba4f06a Modified inventory selection during shipment creation 2018-12-26 18:34:49 +05:30
jitendra 2e668c7020 Inventory source selection feature added during shipment creation 2018-12-26 15:30:23 +05:30
Prashant Singh 182bdba0e6
Merge branch 'master' into master 2018-12-26 15:11:09 +05:30
rahul shukla 95161d9101 changes in config 2018-12-26 14:59:52 +05:30
rahul shukla 1e25226997 Merge branch 'master' of https://github.com/bagisto/bagisto into rahul 2018-12-26 14:47:50 +05:30
rahul shukla 9bb9ae5ce7 configuration changes 2018-12-26 14:46:27 +05:30
Prashant Singh ee0ab9107d Shipping origin configuration 2018-12-26 13:59:51 +05:30
Prashant Singh 14ee9beb69 Slider validation fix, wasn't able to create slider layers 2018-12-24 15:33:39 +05:30
Prashant Singh ebbad1013f datagrid checkbox alignment issue resolved 2018-12-24 13:19:39 +05:30
Prashant Singh 3789587584 datagrid date filter was not working with aliases is not fixed #392 2018-12-22 18:07:45 +05:30
Prashant Singh 232e430ab0 fixed issue #319 2018-12-22 16:15:23 +05:30
Prashant Singh affcca3d08 fixed issue #304 2018-12-22 16:12:42 +05:30
Prashant Singh e526af061e Fixed issues #378, #379 and #373 2018-12-22 15:02:10 +05:30
Prashant Singh 81da5bd1d1 Changed the product card hover style and fixed issue #369 2018-12-22 11:56:26 +05:30
jitendra f4ca5a5b34 Compiled assets for production 2018-12-21 18:54:07 +05:30
Prashant Singh 2b8e198d0d cart customer details fetched when user logged in 2018-12-21 18:48:31 +05:30
Prashant Singh 089aaadb71 merge conflicts removed 2018-12-21 18:35:23 +05:30
Prashant Singh ae9bcb8398 sort by field's translation value issue fixed on category page 2018-12-21 18:20:58 +05:30
jitendra 5916482f7c Add fire event on every controller 2018-12-21 18:18:34 +05:30
Prashant Singh 529db351f6 orders menu item was missing from the customer account side menu 2018-12-21 16:26:15 +05:30
Prashant Singh 6fba17ea81 Fixed issues #300 & Updated inventory in product grid after order received 2018-12-21 16:14:20 +05:30
Prashant Singh 5ebe171117 Fixed issue #363 2018-12-21 14:18:59 +05:30
Prashant Singh a69807c488 fixed issue #366 2018-12-21 14:15:24 +05:30
Prashant Singh 54a268302b fixed issue #354 2018-12-21 14:05:52 +05:30
jitendra 64e451d7f9 Issue #367 fixed 2018-12-21 13:57:58 +05:30
jitendra 17480d8b67 Issue #365 2018-12-21 13:25:58 +05:30
jitendra ae40692084 Issues #356 2018-12-21 13:18:05 +05:30
jitendra 954502c571 Issues #353, #354 2018-12-21 11:58:02 +05:30
jitendra 8b18b78663 Assets compiled for production 2018-12-20 18:26:18 +05:30