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

774 Commits

Author SHA1 Message Date
Prashant Singh 2df1a84191 Security fix underway need pull from other branches 2019-04-08 19:46:19 +05:30
rahul shukla 4bd89950ce change update & delete query in controller & comment added 2019-04-08 16:48:43 +05:30
Prashant Singh 82e56334c2 Fixed modal style issues, localization of routes issue and updated description string of version command 2019-04-07 06:30:55 +05:30
Prashant Singh c7482f576e Some styles fixes on auth pages of customer and footer bottom 2019-04-07 03:44:18 +05:30
Prashant Singh 61fd02ed57 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-05 19:38:56 +05:30
rahul shukla fdb6284856 issue #760 wishlist 2019-04-05 16:54:09 +05:30
Prashant Singh 5c94a8a21f changed name of folder from 'sass' to 'scss' inside packages Admin, Shop & Ui 2019-04-04 14:50:59 +05:30
rahulshukla-webkul 23bb48e759 Development (#790) 
* issue #753 swatch issue

* edit validation for swatch

* #783 product image with installer

* issue #773

* removal of view composers in shop

* issue #785 product name display

* merge with master & assests compile
 2019-04-03 12:17:47 +05:30
rahulshukla-webkul 9314d9159c Development (#789) 
* issue #753 swatch issue

* edit validation for swatch

* #783 product image with installer

* issue #773

* removal of view composers in shop
 2019-04-03 11:37:48 +05:30
rahul shukla 39acb0de43 merge with master 2019-04-02 13:26:39 +05:30
rahul shukla 9e58602262 issue #758 2019-04-02 13:24:11 +05:30
Jitendra Singh 95ea54d220
Merge pull request #779 from prashant-webkul/development 
Fixed issue #775
 2019-04-02 10:27:43 +05:30
Prashant Singh 9c55f5037d Fixed issue #775 2019-04-02 09:39:43 +05:30
rahul shukla 56142bf3d8 issue #759 2019-04-01 20:00:54 +05:30
Jitendra Singh 0bd03c2c62
Merge pull request #769 from cagartner/feature/add-id-streetlines 
Added id attribute to streetlines
 2019-04-01 15:15:24 +05:30
Prashant Singh 06aa4dd6bf Fixed issue #749 for all customer resources profile, wishlist, reviews, orders and addresses 2019-04-01 12:45:56 +05:30
Prashant Singh 40ebb3a0c4 Fixed issue #749 for all customer resources profile, wishlist, reviews, orders and addresses 2019-04-01 12:43:44 +05:30
Prashant Singh 4a2efc8eee fixed issue #749 2019-04-01 01:32:58 +05:30
Carlos Augusto Gartner b8d78ab00d Added id attribute to streetlines 2019-03-31 15:35:07 -03:00
Prashant Singh ea99fc8c68 fixed issue 764 2019-03-31 22:41:14 +05:30
Prashant Singh 1d372621ce Security fix for customer information and fixed issue #762 2019-03-30 18:55:10 +05:30
rahul shukla 257dfc8b1e rtl css for product list & currency capital 2019-03-29 16:48:00 +05:30
rahul shukla 8897a27499 issue #730 2019-03-29 13:11:49 +05:30
Prashant Singh fef1b2d8da Fixing of 3rd level menu issue for custom roles #705 2019-03-28 18:09:29 +05:30
rahul shukla d4c58724ae issue #728 2019-03-28 15:36:48 +05:30
rahul shukla fb6b4a13f1 issue #738 2019-03-28 14:29:45 +05:30
rahul shukla 23fe05e192 issue #742 2019-03-28 10:10:26 +05:30
rahul shukla c2f24d47cb merge with master 2019-03-27 14:26:52 +05:30
rahul shukla a3b9ef427e Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-27 14:25:21 +05:30
Jitendra Singh 5a2a3c1988
Merge pull request #744 from cagartner/feature/default-laravel-translations 
Created default laravel translation for pt_BR
 2019-03-27 09:10:16 +05:30
Carlos Augusto Gartner cbfe9a53dd Created default laravel translation for pt_BR 2019-03-26 15:17:45 -03:00
rahul shukla d4d93739dc product zoom functionality added 2019-03-25 16:32:13 +05:30
rahul shukla 2a57530184 issue #735 & minor config changes for select 2019-03-22 14:54:46 +05:30
rahul shukla e41445e802 issues #729 and #731 2019-03-22 12:54:38 +05:30
rahul shukla e052276907 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-22 11:58:28 +05:30
rahul shukla dca138ae85 issue #724 2019-03-22 11:58:11 +05:30
Prashant Singh c84e76646e Fixed issue #720 2019-03-20 10:13:27 +05:30
Prashant Singh 8b85452097 changed the add to buttons in bagisto 2019-03-19 18:18:59 +05:30
rahul shukla a9d1794547 changes in cross sell 2019-03-18 19:01:10 +05:30
rahul shukla f54f8989dc Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-18 16:36:00 +05:30
rahul shukla 10f40c90ec strict mode error 2019-03-18 16:35:41 +05:30
jitendra 41217e525f Assets compiled for production 2019-03-15 19:31:23 +05:30
Prashant Singh 8b430988c4 assets compiled for production 2019-03-15 16:46:02 +05:30
Jitendra Singh 1759392af5
Merge pull request #698 from jitendra-webkul/jitendra 
Category display mode feature added
 2019-03-15 13:09:19 +05:30
jitendra 2e9f58917f Category display mode feature added 2019-03-15 13:08:21 +05:30
rahul shukla 4ed551c008 removing zoom 2019-03-14 14:41:21 +05:30
rahul shukla ebf96ad9d6 installer isuue & product page changes 2019-03-14 14:34:32 +05:30
Prashant Singh 5fc85dffe4 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-14 11:01:04 +05:30
Prashant Singh 31eab00df7 added disbaled state to the new radio button used on checkout pages 2019-03-14 10:59:35 +05:30
rahul shukla 281567456b product linking completed 2019-03-13 10:33:43 +05:30
rahul shukla 3bb197c75a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-13 09:38:36 +05:30
rahul shukla 9b82321d4f change in related products 2019-03-12 21:05:10 +05:30
Jitendra Singh 7ad71d1d58
Merge pull request #682 from jitendra-webkul/jitendra 
Update get all product function
 2019-03-12 18:24:00 +05:30
jitendra 961e00227f Update get all product function 2019-03-12 18:23:11 +05:30
Jitendra Singh 45afd5652e
Merge pull request #681 from cagartner/pt-br-translation 
Added pt-br translation
 2019-03-12 17:57:37 +05:30
Carlos Augusto Gartner 2e2d7d7642 Added pt-br translation 2019-03-12 09:19:27 -03:00
jitendra a7eec79fbd Editor added on category description textarea 2019-03-12 16:45:08 +05:30
jitendra 99e866d055 Fixed slider controller namespace issue 2019-03-12 16:03:57 +05:30
jitendra 12a4c6dc09 Fixed conflict and Assets compiled for prodcution 2019-03-12 12:04:55 +05:30
jitendra 42b5f91764 Feature Request #666 implented 2019-03-12 11:59:00 +05:30
Prashant Singh 238c248852 Filterable checks implemented in datagrid 2019-03-11 19:36:15 +05:30
Jitendra Singh d1489fa498
Merge pull request #663 from jay-thanki/patch-2 
subscriber_email email changes
 2019-03-08 11:54:13 +05:30
Jay Thanki 727e6a2b89
subscriber_email email changes 
change email subscriber_email as footer field assign to this field.
 2019-03-08 11:31:31 +05:30
Jay Thanki 23db740306
subscriber_email changes 
email names are same for signup form and footer email address field. so i changed footer email addess to subscriber_email
 2019-03-08 11:31:18 +05:30
rahul shukla 4e803a638b reverting category changes 2019-03-07 18:31:18 +05:30
rahul shukla faf2400a75 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-07 18:22:08 +05:30
rahul shukla b0d0e63d0d issues #656, #618, #384 & linked products changes 2019-03-07 18:21:49 +05:30
Prashant Singh 1e215e43c0 Some html attributes added on the checkout pages 2019-03-07 10:05:05 +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
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
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 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 e5f1abe7a9 Product grid item per page increased to 20 2019-02-27 12:02:48 +05:30
Prashant Singh c5aceb72d0 event bus events added in onepage checkout for shipping and payments 2019-02-26 18:24:38 +05:30
rahul shukla 724c81ffd7 conflict resolve 2019-02-26 14:13:07 +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 7cfc0d3710 issue #618 & #619 & rtl css changes 2019-02-25 18:06:18 +05:30
Prashant Singh 5e704a4979 more testcases for customer authentication 2019-02-23 17:23:46 +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 59ecc0f019 guest review 2019-02-21 16:36:27 +05:30
rahul shukla a7f545fcf4 issue #594 2019-02-20 19:11:46 +05:30
rahul shukla be1de2d1ab assests compile 2019-02-20 14:46:44 +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 5e4ab5dd8f Webpack mix files updated and assets compiled for production 2019-02-20 12:38:09 +05:30
jitendra 3d5e2955a4 Issue #598 fixed 2019-02-20 11:57:06 +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
rahul shukla 1a9c3d56c2 issue #587 & css changes 2019-02-18 17:01:53 +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 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
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
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 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
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
Prashant Singh 510ee89aad language meta tag added for storefront 2019-02-13 15:05:56 +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
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
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
jitendra 2fec94082c Fixed account menu issue 2019-02-04 20:32:06 +05:30
jitendra f2f3592376 Assets compiled for production 2019-02-04 15:41:43 +05:30
Prashant Singh 6fe7167ecd assets compiled for production 2019-02-04 15:30:10 +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
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 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
rahul shukla 745d6c1b48 responsive header menu 2019-02-01 17:06:32 +05:30
jitendra 91b8bfeba2 Rating label fixed on product view page 2019-01-31 18:38:45 +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 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 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
rahul shukla 36f98a8a4e issue #234 2019-01-28 17:05:06 +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 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 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
rahul shukla a269dc614f composer for installer 2019-01-22 16:13:56 +05:30
Prashant Singh f553dcdc71 assets compiled for production 2019-01-21 15:52:56 +05:30
jitendra 42eb46e78c Asset compiled for production 2019-01-21 15:26:00 +05:30
jitendra 33a75c306d Added view event manager to checkout and cart page 2019-01-18 18:16:05 +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
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 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
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 a781594b10 Translations added for menu and acl lables 2019-01-15 16:03:55 +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
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
jitendra b388dc9aa6 Assets compiled for production 2019-01-04 19:24:03 +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 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
rahul shukla 29ab4f1da9 merge with master 2018-12-31 18:51:42 +05:30