Commit Graph

1033 Commits

Author SHA1 Message Date
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