Commit Graph

1705 Commits

Author SHA1 Message Date
jitendra e99daf28e2 Issue #834 fixed 2019-04-18 12:52:51 +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
jitendra 700a2951e6 added related products and up sells to the product view page 2019-04-16 15:57:38 +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
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
Jitendra Singh 32a97a9b4b
Merge pull request #823 from prashant-webkul/development
Development
2019-04-15 16:42:11 +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
Jitendra Singh 810e57f092
Merge pull request #821 from prashant-webkul/development
Development
2019-04-15 15:02:09 +05:30
Prashant Singh feaaaa89a5 fixed some style issues 2019-04-14 15:30:43 +05:30
Prashant Singh 492ef9a988 added test for dusk customer login 2019-04-13 11:59:54 +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
Prashant Singh 3fe8152758 added php tooltip.js dependency and laravel dusk for browser tests profiling 2019-04-12 18:20:33 +05:30
Jitendra Singh 72305acff6
Merge pull request #819 from rahulshukla-webkul/development
Development
2019-04-10 18:11:22 +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 Singh a73c16b987
Merge pull request #816 from jitendra-webkul/jitendra
Jitendra
2019-04-10 12:12:06 +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
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
Prashant Singh ea04a8c944 Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-09 18:38:32 +05:30
Prashant Singh 025a5a9146 changed product zoomer config 2019-04-09 18:38:17 +05:30
rahul shukla b27afc6e1e Merge branch 'master' of https://github.com/bagisto/bagisto into development 2019-04-09 18:00:19 +05:30
rahul shukla e5d71fa280 change in jquery for wishlist icon for zoom 2019-04-09 17:59:58 +05:30
naresh verma 642ef2b1c1 reverting config changes 2019-04-09 17:23:37 +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 Singh a8f00f37f7
Merge pull request #811 from jitendra-webkul/jitendra
Theme finder issue fixed (Shop changes was reflecting in admin)
2019-04-09 15:23:36 +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
Jitendra Singh 4840b0361b
Merge pull request #810 from prashant-webkul/development
Development
2019-04-09 14:15:59 +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