Commit Graph

1339 Commits

Author SHA1 Message Date
jitendra e99daf28e2 Issue #834 fixed 2019-04-18 12:52:51 +05:30
rahul shukla 439652699e issue #836 2019-04-17 19:20:07 +05:30
rahul shukla 13ac4a9571 issue #824 2019-04-17 15:21:48 +05:30
rahul shukla 58ddc68520 issues 2019-04-17 12:56:33 +05:30
prateek srivastava df8f54597a scroller code removed 2019-04-17 12:30:50 +05:30
prateek srivastava eb5bad16ff removed code for scroller 2019-04-17 12:24:41 +05:30
rahul shukla ad6acfa7e0 issue #824 2019-04-16 20:15:28 +05:30
rahul shukla ae6d498f4c merge with master 2019-04-16 19:22:49 +05:30
prateek srivastava 558b416bb6 Merge branch 'development' of https://github.com/prateek-webkul/bagisto into development 2019-04-16 19:22:03 +05:30
rahul shukla 3e97bacf91 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-16 19:19:26 +05:30
rahul shukla 095c045c58 change table of product datagrid to product_flat 2019-04-16 18:59:29 +05:30
jitendra 7fc68c56ae Added product id attribute to model 2019-04-16 16:37:52 +05:30
jitendra dd90e63ade Fixed add to cart issue 2019-04-16 16:32:30 +05:30
jitendra 1dd23a5a39 Changed varaible name productFlat to product in product card page 2019-04-16 16:02:04 +05:30
rahul shukla 4e56374c70 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-16 16:01:37 +05:30
jitendra 700a2951e6 added related products and up sells to the product view page 2019-04-16 15:57:38 +05:30
rahul shukla a4bb5a036b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-16 15:55:42 +05:30
Jitendra Singh 3984d92fad
Merge pull request #828 from prashant-webkul/development
Development
2019-04-16 15:46:32 +05:30
Jitendra Singh a031eabbf4
Merge pull request #829 from jitendra-webkul/jitendra
Issue #803 fixed
2019-04-16 15:41:39 +05:30
jitendra eb00f36835 Issue #803 fixed 2019-04-16 15:40:58 +05:30
rahul shukla d568ea4bbe merge with master 2019-04-16 15:35:54 +05:30
Prashant Singh 53ebbf5a1e Removed product grid events, product grid table is now obselete and maybe used in future for someother purposes. In result we will have a faster product creation and a new grid will be added with product flat table 2019-04-16 14:47:28 +05:30
Prashant Singh 1aa9bf78aa Removed unforced controller file from attribute package's Repositories directory 2019-04-16 14:41:12 +05:30
Prashant Singh af88e8951a Unnecessary Tax models removed from core, were originally moved from core to Tax module 2019-04-16 14:39:30 +05:30
Prashant Singh ca7a5e4a6f Changed the moduleServiceProvider registration back in concord config file. 2019-04-15 16:37:25 +05:30
Prashant Singh 36f6c425c2 Assets compiled for production 2019-04-15 15:14:32 +05:30
Prashant Singh feaaaa89a5 fixed some style issues 2019-04-14 15:30:43 +05:30
Prashant Singh f35e9a48d8 corrected composer.json provider path for UI package 2019-04-13 10:33:23 +05:30
Prashant Singh 520c21a4cd Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-13 10:32:42 +05:30
rahul shukla 44c898824e removed duplicate entry in product linking 2019-04-12 18:43:42 +05:30
Prashant Singh 3fe8152758 added php tooltip.js dependency and laravel dusk for browser tests profiling 2019-04-12 18:20:33 +05:30
rahul shukla ee889cc259 upgrade code of zoom 2019-04-12 16:40:45 +05:30
rahul shukla 1caa3eb4f6 image zoom in rtl 2019-04-12 14:11:05 +05:30
rahul shukla 07b6ac6903 limit for up_sell, cross_sell & related product 2019-04-12 13:05:45 +05:30
rahul shukla f1c263805c issues #815 2019-04-10 16:45:52 +05:30
rahul shukla 2a859b7e23 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-10 15:08:15 +05:30
rahul shukla b99b0ad8b5 product attribute & category menu 2019-04-10 15:08:01 +05:30
Jitendra Singh ebc0befe6a
Merge pull request #813 from naresh-webkul/development
Development
2019-04-10 13:25:43 +05:30
rahul shukla d1e38fe83b Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-10 12:12:15 +05:30
jitendra f3f61e3c91 Optimized performance 2019-04-10 12:10:46 +05:30
naresh verma 4f999ee34a changed shipment table content 2019-04-09 19:40:43 +05:30
prateek srivastava f2def6c4bc scroller issue fixed 2019-04-09 19:28:44 +05:30
naresh verma ab4c054292 changed shipment table 2019-04-09 18:52:44 +05:30
rahul shukla b6a1a05e66 added permission of add & delete in acl 2019-04-09 18:52:03 +05:30
rahul shukla e5d71fa280 change in jquery for wishlist icon for zoom 2019-04-09 17:59:58 +05:30
naresh verma b0296a02e0 inventory source mail 2019-04-09 17:04:20 +05:30
jitendra fb6ffaa9d9 JWT implemented for customer api authorization 2019-04-09 16:27:33 +05:30
rahul shukla 5e15e05c78 tax category message change 2019-04-09 16:15:04 +05:30
Jitendra Singh 7678593bd4
Merge pull request #812 from rahulshukla-webkul/development
Development
2019-04-09 15:52:46 +05:30
rahul shukla 6a7f247d7a Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-09 15:30:52 +05:30
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