Commit Graph

1339 Commits

Author SHA1 Message Date
jitendra 6b247993e4 Theme finder issue fixed (Shop changes was reflecting in admin) 2019-04-09 15:22:45 +05:30
rahul shukla a3999d7a23 merge with master 2019-04-09 15:13:26 +05:30
rahul shukla 9d89ec816d comment, variable name changes 2019-04-09 14:17:18 +05:30
rahul shukla 09aa34b36a issue #749 fixed again & reduce query 2019-04-09 14:05:57 +05:30
Prashant Singh 1ec1c5d83c fixed some bugs 2019-04-09 13:29:31 +05:30
Prashant Singh 1ca1ae5b61 Changed responses for all backend destroy functions and removed dead commented code 2019-04-09 13:17:19 +05:30
Prashant Singh b3bf66c6e2 Base sync with master 2019-04-09 12:53:31 +05:30
Prashant Singh 75ef9cd530 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-09 12:50:09 +05:30
rahul shukla 8e7c3c7f22 restore migration 2019-04-09 12:12:35 +05:30
rahul shukla dbde05e0cd change in delete query 2019-04-09 12:05:52 +05:30
Prashant Singh 09d6afc72a Implemented customer configuration based features:
1. Email Verification.
2. Email Subscription.
2019-04-09 08:03:31 +05:30
Prashant Singh 6c74b2ca42 admin assets compiled for production 2019-04-09 06:33:36 +05:30
Prashant Singh 6a4cb016c4 fixed issue #750 2019-04-09 06:31:52 +05:30
Prashant Singh d8d645eb41 fixing csrf issue for datagrid delete 2019-04-08 20:26:04 +05:30
Prashant Singh 2df1a84191 Security fix underway need pull from other branches 2019-04-08 19:46:19 +05:30
rahul shukla efd38ab99e issue #718 2019-04-08 19:33:23 +05:30
rahul shukla 4bd89950ce change update & delete query in controller & comment added 2019-04-08 16:48:43 +05:30
Prashant Singh 747f214739 fix in progress for get routes performing actions more than redirect 2019-04-08 04:51:02 +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 1033bd8d31 Merge branch 'development' of https://github.com/prashant-webkul/bagisto into development 2019-04-06 02:23:12 +05:30
Prashant Singh 8cfcf3d484 order view for customer fixed 2019-04-06 02:18:31 +05:30
Prashant Singh 61fd02ed57 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-05 19:38:56 +05:30
Prashant Singh 1e6579bedf in fix 2019-04-05 19:38:44 +05:30
rahul shukla 28c45c9bfa issue #802 2019-04-05 19:29:04 +05:30
rahul shukla 91477e50c0 issue #802 sqllite 2019-04-05 19:19:10 +05:30
rahul shukla ee189baf7a merge with master 2019-04-05 16:55:09 +05:30
rahul shukla fdb6284856 issue #760 wishlist 2019-04-05 16:54:09 +05:30
Prashant Singh e88bf10c55 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-05 12:00:10 +05:30
jitendra e83a27a31b Issue #803 fixed 2019-04-05 11:42:52 +05:30
Jitendra Singh 89613136ff
Merge pull request #795 from imanghafoori1/flatten_code
flatten code
2019-04-05 11:10:49 +05:30
Prashant Singh dadbf2bd6a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-05 10:47:16 +05:30
Prashant Singh 380f265ef1 H tag font sizes fix 2019-04-05 10:46:57 +05:30
imanghafoori ca93e36826 flatten code 2019-04-04 23:53:59 +04:30
imanghafoori 07806c44fc flatten code 2019-04-04 23:51:33 +04:30
rahul shukla 4c2a0a08fc email subscription & newsletter verifiaction 2019-04-04 19:34:01 +05:30
rahul shukla 7be61550a4 change in query for muliselect attribute & layered navigation 2019-04-04 19:11:32 +05:30
rahul shukla e0ab120b9b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-04 15:44:17 +05:30
rahul shukla 9c8f4f9522 issue #799 multiselect attribute & layered navigation 2019-04-04 15:43:33 +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
Jitendra Singh d18b862f85
Merge pull request #796 from imanghafoori1/fix_docblocks
fix docblocks
2019-04-04 12:07:55 +05:30
Jitendra Singh 8ac9c7b8ba
Merge pull request #793 from prateek-webkul/development
issue fixed #791
2019-04-04 11:56:34 +05:30
imanghafoori 56933912eb fix docblocks 2019-04-03 18:13:59 +03:30
imanghafoori 2daf56c4fd refactor using ::class 2019-04-03 17:24:45 +03:30
prateek srivastava 504a5ec038 issue fixed #791 2019-04-03 18:03:11 +05:30
prateek srivastava 1cb03f9ac3 admin scroller bug fixed 2019-04-03 15:23:12 +05:30
Jitendra Singh 3dee0678f7
Merge pull request #788 from imanghafoori1/flatten_foreach
flatten code
2019-04-03 14:49:22 +05:30
Jitendra Singh d0e5e6a88f
Merge pull request #786 from imanghafoori1/flatten_code
Flatten code
2019-04-03 14:49:06 +05:30
Iman 759782c735 fix doc blocks (#787) 2019-04-03 12:34:35 +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
prateek srivastava b655a848d7 admin scroller bug fixed 2019-04-03 12:17:23 +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
imanghafoori fadd26bd13 flatten code 2019-04-02 22:10:34 +03:30
imanghafoori 14cd4eb97e flatten code 2019-04-02 21:50:44 +03:30
Prateek Srivastava f2e4930e8e admin nav left menu scroll bug fixed (#784)
* admin nav left menu scroll bug fixed

* scroller

* scroller

* fixed syntax for PR #784
2019-04-02 18:26:31 +05:30
prateek srivastava 1492022c20 fixed syntax for PR #784 2019-04-02 18:24:43 +05:30
prateek srivastava 896b4eebc3 scroller 2019-04-02 18:07:54 +05:30
prateek srivastava 594d4598a5 scroller 2019-04-02 18:03:12 +05:30
prateek srivastava e0fc65b0da admin nav left menu scroll bug fixed 2019-04-02 17:57:34 +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 ba10a19319
Merge pull request #781 from prashant-webkul/development
fixed issue #765
2019-04-02 13:14:07 +05:30
Prashant Singh f9cdc21066 fixed issue #765 2019-04-02 13:06:13 +05:30
Jitendra Singh 09dbdb3fea
Merge pull request #776 from imanghafoori1/master
Flattened the code
2019-04-02 11:42:44 +05:30
Prashant Singh 2493b9e614 Provided amend in issue #705 2019-04-02 11:36:33 +05:30
Prashant Singh 80743dc19b fixed issue #705 2019-04-02 11:34:45 +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
imanghafoori a84b81f446 flatten code 2019-04-01 18:39:15 +03:30
imanghafoori 1a4c040894 remove unused code 2019-04-01 18:38:18 +03:30
rahul shukla 56142bf3d8 issue #759 2019-04-01 20:00:54 +05:30
rahul shukla 84d4992944 issue #757 2019-04-01 18:06:16 +05:30
rahul shukla 5a41b57793 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-01 17:17:51 +05:30
rahul shukla 037126f82a issue #757 2019-04-01 17:17:26 +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 91b4d1f955 fixed issue #761 2019-03-31 23:37:50 +05:30
Prashant Singh 0e1f26e835 fixed issue #763 2019-03-31 22:56:30 +05:30
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
Prashant Singh 8af43eb5cc session expiration time now changed to 10 minutes to counter XSRF requests 2019-03-30 18:14:54 +05:30
Prashant Singh 5346312ad0 revising issue #705 2019-03-30 16:50:53 +05:30
Prashant Singh fc3c1a468b fixed issue #705 2019-03-30 16:44:21 +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
rahul shukla 12a8a91476 issue #727 2019-03-29 10:24:22 +05:30
rahul shukla 68bb6a6149 issue #706 2019-03-28 20:20:00 +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 0002f7caaa issue #736 2019-03-28 12:50:00 +05:30
Prashant Singh 034deb05fc Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-28 10:35:24 +05:30
rahul shukla 179ac647d8 variable name change 2019-03-28 10:14:36 +05:30
rahul shukla 23fe05e192 issue #742 2019-03-28 10:10:26 +05:30
rahul shukla fa0a3ee4ee issue #706 2019-03-27 20:13:43 +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
Prashant Singh abf563ced1 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-27 09:29:38 +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
Prashant Singh e9b511a92a probable solution for 3 level menu bug 2019-03-26 16:00:37 +05:30
rahul shukla d4d93739dc product zoom functionality added 2019-03-25 16:32:13 +05:30
Prashant Singh 54d2a000c8 Fixing some issues and probably solving later 2019-03-25 15:59:37 +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
rahul shukla dc08bbc06e installer issue 2019-03-20 15:09:24 +05:30
Prashant Singh c84e76646e Fixed issue #720 2019-03-20 10:13:27 +05:30
Prashant Singh b4c7bc550c Fixed issue #712 2019-03-20 09:39:49 +05:30
Prashant Singh 8d486f336c Fixed issue #708 2019-03-20 09:34:08 +05:30
Prashant Singh 8b85452097 changed the add to buttons in bagisto 2019-03-19 18:18:59 +05:30
Prashant Singh b59c25bfb8 Bug fix 2019-03-19 16:19:41 +05:30
Prashant Singh 7ad8d567b1 Arabic translations added 2019-03-19 14:28:35 +05:30
Prashant Singh 2b17cdb7fd fixed issue #713 2019-03-19 13:24:28 +05:30
Prashant Singh 97da404216 default channel now getting checked with admin 2019-03-19 13:22:06 +05:30
Jitendra Singh 7a0d470c20
Merge pull request #715 from rahulshukla-webkul/development
Development
2019-03-19 12:17:06 +05:30
Jitendra Singh a34a2f2ba4
Merge pull request #714 from prashant-webkul/development
Development
2019-03-19 12:16:54 +05:30
Prashant Singh 40a0fa8cb0 Fixed issues #710 #709 2019-03-19 12:13:17 +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
Jitendra Singh 947c1ab526
Merge pull request #702 from jitendra-webkul/jitendra
Jitendra
2019-03-15 19:07:55 +05:30
jitendra 94dfe8dc69 Fixed resource controller issue 2019-03-15 19:00:44 +05:30
jitendra 2123260387 Added formated price key in product api 2019-03-15 18:48:51 +05:30
Jitendra Singh a222b221bf
Merge pull request #701 from jitendra-webkul/jitendra
Jitendra
2019-03-15 17:57:58 +05:30
jitendra ef988b093f Product base image property added in prodcut api 2019-03-15 17:47:54 +05:30
Prashant Singh 0a4fd97a0c fixed issues with rtl 2019-03-15 17:14:13 +05:30
Prashant Singh 8b430988c4 assets compiled for production 2019-03-15 16:46:02 +05:30
Prashant Singh d4f292490b more probable solution for admin menu scrolling 2019-03-15 13:28:55 +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
Jitendra Singh b615303003
Merge pull request #697 from jitendra-webkul/jitendra
Category Repository issue fixed
2019-03-15 12:01:17 +05:30
jitendra 340b621b1a Category Repository issue fixed 2019-03-15 12:00:33 +05:30
Jitendra Singh c23343377f
Merge pull request #696 from jitendra-webkul/jitendra
Sorting added in ResourceController
2019-03-15 10:37:20 +05:30
jitendra 4ca1095265 Sorting added in ResourceController 2019-03-15 10:36:27 +05:30
Jitendra Singh c19e062cfd
Merge pull request #695 from jitendra-webkul/jitendra
Added getCurrentLocale function in Core.php
2019-03-14 18:24:40 +05:30
jitendra 218ef7a85f Added getCurrentLocale function in Core.php 2019-03-14 18:24:02 +05:30
rahul shukla a887cf8b92 slider controller name issue 2019-03-14 17:05:18 +05:30
Prashant Singh 319e4edeb1 some more logic is required for proper scrolling of menu bar 2019-03-14 15:50:24 +05:30
rahul shukla 4ed551c008 removing zoom 2019-03-14 14:41:21 +05:30
rahul shukla 4ab95b1464 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-14 14:34:46 +05:30
rahul shukla ebf96ad9d6 installer isuue & product page changes 2019-03-14 14:34:32 +05:30
Prashant Singh 556dd64327 removed some dead code 2019-03-14 12:06:51 +05:30
jitendra c38e107515 Added api for single lavel child categories 2019-03-14 11:32:47 +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
Prashant Singh d66f9de5dd admin layout fixes 2019-03-13 19:47:40 +05:30
Prashant Singh b6d14808b6 layout fixes in admin panel 2019-03-13 19:12:00 +05:30
Jitendra Singh 92adadb882
Merge pull request #689 from jitendra-webkul/jitendra
Added api for get request
2019-03-13 16:48:30 +05:30
jitendra f489c42bdd Added api for get request 2019-03-13 16:47:52 +05:30
rahul shukla 99405ebcaf Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-13 12:34:16 +05:30
rahul shukla 634dd0e458 translation added for configuration 2019-03-13 12:33:45 +05:30
Jitendra Singh fcd99188da
Merge pull request #686 from jitendra-webkul/jitendra
Updated customer group mapping function name
2019-03-13 12:25:22 +05:30
jitendra 672f2f8c2b Updated customer group mapping function name 2019-03-13 12:24:32 +05:30
rahul shukla 62d3685c24 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-13 11:05:33 +05:30
rahul shukla 281567456b product linking completed 2019-03-13 10:33:43 +05:30
Prashant Singh 9f22696491 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-13 10:21:38 +05:30
rahul shukla 3bb197c75a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-13 09:38:36 +05:30
Carlos Augusto Gartner ef30e1d0b5 Added pt-br translation for UI package 2019-03-12 15:36:15 -03:00
rahul shukla 9b82321d4f change in related products 2019-03-12 21:05:10 +05:30
Prashant Singh cd9504324c Adding the scroll event script on navbar left in progress 2019-03-12 19:10:26 +05:30
Jitendra Singh 423fb8c446
Merge pull request #683 from jitendra-webkul/jitendra
'getAll' function of ProductRepository modified
2019-03-12 18:33:11 +05:30
jitendra ff1154c422 'getAll' function of ProductRepository modified 2019-03-12 18:32:23 +05:30
Prashant Singh e512bad843 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-12 18:31:46 +05:30
Prashant Singh ec19630b22 Fixed some layout issues with admin 2019-03-12 18:31:15 +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
Prashant Singh d2836b50ab One way to hide the side drawer 2019-03-12 13:39:32 +05:30
Prashant Singh 97ce7dc195 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-12 12:25:50 +05:30
Prashant Singh c9c5208693 Updated the list of exportable grids 2019-03-12 12:19:28 +05:30
Prashant Singh 9578f7609b export functionality refactored 2019-03-12 12:13:48 +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 9eb1deb3fa Datagrid export functionality refactoring 2019-03-12 11:07:12 +05:30
Jitendra Singh 4dc7ef649c
Merge pull request #673 from prashant-webkul/development
disabled side menu toggle for admin, created configuration for produc…
2019-03-12 09:57:57 +05:30
Prashant Singh 9cfbdc6c1b Filterable checks implemented in datagrid 2019-03-11 19:36:58 +05:30
Prashant Singh 238c248852 Filterable checks implemented in datagrid 2019-03-11 19:36:15 +05:30
Jitendra Singh ff45ce45d3
Merge pull request #674 from jitendra-webkul/jitendra
Modified Slider Model
2019-03-11 18:44:06 +05:30
jitendra 91c55a7010 Modified Slider Model 2019-03-11 18:43:06 +05:30
Prashant Singh bd525ef606 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-03-11 18:42:34 +05:30
Prashant Singh 20247136a0 disabled side menu toggle for admin, created configuration for product types 2019-03-11 18:39:42 +05:30
rahul shukla 19f4429de0 issue #670 2019-03-11 17:57:15 +05:30
Jitendra Singh 43f7d7e9c1
Merge pull request #665 from rahulshukla-webkul/development
issue #655
2019-03-08 14:32:24 +05:30
rahul shukla 3ad2aec865 issue #655 2019-03-08 13:31:16 +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