Commit Graph

709 Commits

Author SHA1 Message Date
prashant-webkul 79a6d3634e Address delete confirmation box is now tied up with the dynamic translation package 2018-12-10 13:40:58 +05:30
prashant-webkul 60babb693d Previous datagrid columns for date and booleans were of type string but they have been changed according to the new filters for the respective 2018-12-10 09:58:45 +05:30
prashant-webkul 529e0ecd3b date operations in datagrid implemented in order grid filters 2018-12-07 18:54:58 +05:30
prashant-webkul 263c23698e boolean filtering now implemented in datagrid 2018-12-07 17:21:19 +05:30
prashant-webkul 1e05840c7d Regular merge with master 2018-12-07 15:44:03 +05:30
prashant-webkul 45903d3c0a Mass selection features refactored with a new type of configuration with dynamic routes and implemented mass selection features in reviews, products, currencies and attributes 2018-12-07 14:45:31 +05:30
jitendra 9d41172512 Refactor core config system 2018-12-07 12:38:29 +05:30
jitendra 3515adeb03 Refactor core config system 2018-12-07 12:35:34 +05:30
rahul shukla c90789a210 merge with master 2018-12-07 11:00:02 +05:30
rahul shukla b78cc23797 shipping methods #204 popup confirmation for address delete #228 bagisto icon clickable #183 currency rate display & #128 calender clickable 2018-12-07 10:55:33 +05:30
jitendra 2fa8799694 Product flat migration added 2018-12-07 10:51:40 +05:30
jitendra 7af2514748 Issue #287 (Customer order grid pending payment status issues) 2018-12-06 17:36:08 +05:30
jitendra e29c5f39f0 Issues #286, #284, #279, #277, #276, #273, #270, #279, #226, #182, #165 2018-12-06 17:29:26 +05:30
prashant-webkul b32e0fc456 ordering of data in all the datagrids has now been changed according to newest first or descending with greatest value of the index or autoincrement column 2018-12-05 17:04:14 +05:30
prashant-webkul 7a309fbf9c search issues fixed with is active check for the prooducts and the pagination has been applied on the search page 2018-12-05 16:52:54 +05:30
jitendra aa3ba95250 View Render Event system implemented 2018-12-04 16:35:30 +05:30
rahul shukla b50ef64cec merge with master 2018-12-04 11:53:56 +05:30
rahul shukla 4201a1ec48 export completed 2018-12-04 11:52:01 +05:30
jitendra 5cfdeee743 Fixed Conflicts 2018-12-04 11:41:55 +05:30
rahul shukla 2f555a798c export 2018-12-04 10:52:15 +05:30
jitendra 94a1cd9800 Compiled assets for production 2018-12-04 10:42:02 +05:30
JItendra Singh a60ca52eb6
Merge pull request #257 from bagisto/prashant
Prashant
2018-12-04 10:38:35 +05:30
rahul shukla bd1489dac6 export 2018-12-04 10:07:57 +05:30
jitendra f75cfe66fc ACL issue fixed 2018-12-04 09:56:15 +05:30
rahul shukla 27f5e1d93d export 2018-12-04 09:53:52 +05:30
prashant-webkul 40f37cddd4 customer group add and delete fixes 2018-12-03 18:58:57 +05:30
prashant-webkul 5d42bebbf1 Customer group delete bug fix 2018-12-03 18:50:20 +05:30
prashant-webkul 0c8ad35357 link removal from wishlist 2018-12-03 18:39:29 +05:30
prashant-webkul 510f6e6f63 minor fixes in the merge cart function of cart 2018-12-03 18:37:29 +05:30
JItendra Singh 4977428cca
Merge pull request #256 from AliN11/master
Optimized and minified ExceptionHandler
2018-12-03 14:42:35 +05:30
prashant-webkul 94f2637bc0 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-12-03 13:48:18 +05:30
prashant-webkul 48bece3531 datagrid routes are dynamic for all the action types and mass actions also only two type of mass actions are used as of now single button type and select box type for updating boolean columns or may be incement or decrement in the numeric type columns, while there had a new icon for the orders, invoices and shipments datagrid and minor style bug fix on sales index screens, confirm text is not mandatory when clicking on actions now it can be disabled by commenting on the confirm_text in datagrid configurations, mass actions are also route dependent and can be enabled or disabled on specific grids also. 2018-12-03 13:41:35 +05:30
Ali Nazari 3ea703c367 optimized ExceptionHandler 2018-12-01 13:33:32 +03:30
Iman 264bc14ed3
Update TaxCategoryController.php 2018-12-01 10:48:19 +03:30
prashant-webkul 552bf4b1f9 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-11-30 20:38:15 +05:30
prashant-webkul 7fb67dc161 mass operations and datagrid operations normalization 2018-11-30 20:37:41 +05:30
jitendra 8ae76038fc Category image issue fixed 2018-11-30 18:57:13 +05:30
jitendra f0b1bcc6f4 Add to cart issue fixed 2018-11-30 14:51:35 +05:30
JItendra Singh 14b338556e
Merge pull request #251 from bagisto/prashant
Cart flash message fixed
2018-11-30 14:46:17 +05:30
JItendra Singh 83491fd612
Merge pull request #252 from bagisto/jitendra
Issue #247 (Displaying wrong number of products and sales in category…
2018-11-30 14:46:04 +05:30
prashant-webkul 1ba21f281d Cart flash message fixed 2018-11-30 13:24:54 +05:30
prashant-webkul 36f6783db8 cart bug fixes and small css fix 2018-11-30 13:10:41 +05:30
jitendra 4e8081ed58 Issue #247 (Displaying wrong number of products and sales in category, on dashboard) 2018-11-30 12:15:10 +05:30
rahul shukla 984ff18267 merge with master 2018-11-29 18:13:45 +05:30
prashant-webkul a6adfe679c admin newsletter datagrid translation fixes 2018-11-29 18:08:37 +05:30
rahul shukla bb310cd5c7 route change 2018-11-29 18:07:58 +05:30
prashant-webkul 5f81a79796 Subscription newsletter migration restored and subsctiption newsletter datagrid in admin 2018-11-29 18:05:56 +05:30
rahul shukla 64939485c5 merge with master 2018-11-29 17:52:25 +05:30
rahul shukla e1b2d1eb01 export for customer 2018-11-29 17:39:39 +05:30
prashant-webkul fad4bb83f7 enter key code enabled in datagrid search box 2018-11-29 15:58:42 +05:30
prashant-webkul e1f7b4deff datagrid issue fixes, some column aliases were using underscores due to a bug in symfony it was getting converted into dot, all the aliases are now underscore free 2018-11-29 15:40:23 +05:30
rahul shukla 77c501f170 dfd 2018-11-29 13:52:08 +05:30
rahul shukla a0df76e775 search issue fixed 2018-11-29 13:43:52 +05:30
prashant-webkul 5de07d1b35 mini cart configurable options displaying all in bold now converted back to normal 2018-11-29 13:29:38 +05:30
prashant-webkul b2161571bd XSS fixes in datagrid where directly some columns were create html unescaped, migration fixes for products grid table, changelog added for past two releases v0.1.0 & v0.1.1 2018-11-29 13:20:50 +05:30
rahul shukla bdfe3005b8 merge with master 2018-11-29 13:11:48 +05:30
rahul shukla 30ade42635 review changes 2018-11-29 13:03:50 +05:30
rahul shukla 41aae38b14 view all & customer name 2018-11-29 12:12:44 +05:30
jitendra 2422d93c76 Ajax CSRF token issue fixed 2018-11-29 10:29:17 +05:30
JItendra Singh e56c47697e
Merge pull request #231 from bagisto/prashant
Order, order shipments full name fixes in datagrid
2018-11-28 17:16:55 +05:30
jitendra 7fa16f8be3 Issue #126 fixed (Add asterisk symbol on SKU field) 2018-11-28 17:15:57 +05:30
prashant-webkul daf2bde541 Order, order shipments full name fixes in datagrid 2018-11-28 16:54:23 +05:30
jitendra fe9e219334 Now raw expression will work on select raw dd(->columns); 2018-11-28 16:31:20 +05:30
JItendra Singh c8acd1823d
Merge pull request #205 from bagisto/prashant
migration fixes for product grid and fixes in slider data grid and ta…
2018-11-28 16:15:31 +05:30
prashant-webkul 217c94d76b migration fixes for product grid and fixes in slider data grid and tax categories datagrid 2018-11-28 16:10:48 +05:30
jitendra 4f2ebc4942 Assets compiled for production 2018-11-28 15:59:29 +05:30
JItendra Singh a59d74ddfd
Merge pull request #198 from bagisto/prashant
column label and column removal in attributes and order shipments dat…
2018-11-28 15:14:18 +05:30
prashant-webkul 6f9c63e3ec column label and column removal in attributes and order shipments datagrid 2018-11-28 15:13:24 +05:30
Prashant Singh 6758e05b95
Merge pull request #196 from bagisto/prashant
Prashant
2018-11-28 14:54:46 +05:30
prashant-webkul 311701b00a tax category sync fix and select rates fixed 2018-11-28 14:05:44 +05:30
jitendra 0e38750e37 Issue #192 (Issue with different shipping address) 2018-11-28 13:30:41 +05:30
prashant-webkul a29feaf83f Email Subcription flow changed, email verfication enhancements for resending the email, reset password redirect issue solved and many other issue fixes 2018-11-28 12:59:08 +05:30
jitendra db51f0df0e Invoice status issue fixed 2018-11-28 12:44:04 +05:30
jitendra 230acb8b32 Issue #188 fixed (Customer group delete issue) 2018-11-28 12:41:17 +05:30
jitendra 8425098b2d tinyMCE undefined variable issue fixed 2018-11-28 12:33:02 +05:30
jitendra b57155eab3 Issue #151 fixed (Editor validation issue) 2018-11-28 11:43:38 +05:30
JItendra Singh 8ad380198d
Merge pull request #186 from bagisto/jitendra
Issue #133 fixed
Issue #175 fixed
Issue #176  fixed
Added bootstrap.js in main js file
2018-11-28 11:06:02 +05:30
jitendra fafbcb432b Issues #175, #176 fixed and added bootstrap.js in main js file 2018-11-28 10:56:54 +05:30
prashant-webkul bf63545895 Bug fix for slider content field, changed to text and datagrid invoices and shipments columns added a/c to relevancy and removed mass actions 2018-11-27 18:56:25 +05:30
prashant-webkul 8b0c51c519 Validation messages fixes for client, product grid fixes, customer email verification fixes and changes, migration changes for customer gender columns and other isssues and bug fixes 2018-11-27 16:25:23 +05:30
Ali Nazari 0a973869c7 code improvement 2018-11-27 13:15:58 +03:30
jitendra e416b97e84 Issue #133 fixed 2018-11-27 11:02:53 +05:30
jitendra a9ef1269c3 Dashboard progress issues fixed 2018-11-27 10:53:47 +05:30
jitendra 82760de8d4 Issues #150 fixed 2018-11-27 10:44:13 +05:30
jitendra c510e8ae47 Assets compiled for production 2018-11-27 10:23:33 +05:30
jitendra fb0079bf42 Fixed validation error messages 2018-11-27 10:16:35 +05:30
prashant-webkul f93716a801 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-11-26 10:27:07 +05:30
prashant-webkul 38378248d2 review apis 2018-11-26 10:26:59 +05:30
prashant-webkul dbdf702a28 Product API for Storefront Completed 2018-11-25 20:51:21 +05:30
prashant-webkul 4e6c462317 onepage cart api implemented 2018-11-25 19:13:30 +05:30
prashant-webkul be26ddf986 Storefront fixes in cart and minicart 2018-11-25 15:38:55 +05:30
prashant-webkul 59ff9cbb84 fixes in minicart 2018-11-25 15:33:43 +05:30
prashant-webkul ed9a3baed9 Cart API completed 2018-11-24 19:24:54 +05:30
prashant-webkul 4455613180 Customer Wishlist API implemented 2018-11-24 15:26:31 +05:30
prashant-webkul 9ce3e53914 Fixed Bug in Tax Module 2018-11-23 16:22:19 +05:30
prashant-webkul a497914241 Customer Registration API implemented 2018-11-22 22:17:20 +05:30
prashant-webkul 460b025b2b customer profile old password match bug fixed 2018-11-22 22:00:10 +05:30
prashant-webkul 5b5006b809 Customer Address API for CRUD and getting and making the default address is complete 2018-11-22 20:21:37 +05:30
prashant-webkul 416d871cca Changes in api, subscription and verification 2018-11-22 18:13:03 +05:30
jitendra 4c21d8ead6 Issues #134 fixed and Inventory source add/edit validation issue fixed 2018-11-21 16:44:07 +05:30
prashant-webkul 1c27444705 merged 2018-11-21 12:04:54 +05:30
jitendra 7758f450c6 Added more acl 2018-11-21 11:59:27 +05:30
prashant-webkul 662ff09a24 Bug Fixes 2018-11-21 11:59:18 +05:30
prashant-webkul ab9328d755 Auth API implemented using JWT tokens, removed laravel passport 2018-11-19 17:04:13 +05:30
prashant-webkul 14997d6e97 OAuth Using Laravel Passport 2018-11-17 19:26:48 +05:30
prashant-webkul 98198a73fa Buy Now Fixes 2018-11-17 11:56:10 +05:30
prashant-webkul 6f32272498 Subscription Mail Bug Fixes 2018-11-16 18:49:28 +05:30
prashant-webkul 82a3142c73 subscription mails bug fix 2018-11-16 18:28:41 +05:30
prashant-webkul 8c12e35621 Cart Refactored, Email Subscription, UI Bug Fix, Wishlist Order & Invoices Datagrid 2018-11-16 17:21:10 +05:30
jitendra 8e4d51af83 Typo fixed in ipn helper 2018-11-16 16:47:11 +05:30
jitendra f0ef4f910a Paypal Integration added 2018-11-16 15:41:08 +05:30
jitendra c845fdddb8 Issues fixed 2018-11-13 15:43:09 +05:30
prashant-webkul ede86c2d4d Product Card UI fixes 2018-11-05 11:21:55 +05:30
prashant-webkul eefb7dc9bc Merged 2018-11-05 10:44:16 +05:30
prashant-webkul 3a801a5d72 Pre Loaded 2018-11-05 10:25:05 +05:30
jitendra 37625e2a2d Assets compiled for production 2018-11-02 12:39:17 +05:30
jitendra d958ac45b6 Assets compiled for production 2018-11-01 19:23:06 +05:30
jitendra b182325772 Customer address form issues fixed, invoice print feature addred 2018-11-01 19:18:59 +05:30
rahul shukla 3924a0c943 rtl css 2018-11-01 19:15:54 +05:30
rahul shukla d90a07f159 rtl css 2018-11-01 19:13:55 +05:30
rahul shukla c80a2f4388 responsive product images 2018-10-31 20:01:43 +05:30
jitendra 3b4adf8b08 Assets merged for production 2018-10-31 12:54:50 +05:30
jitendra bc67fe761a Buy now and add to whislist issue fixed 2018-10-31 12:52:27 +05:30
jitendra 7ee3c3a972 Front search issue fixed 2018-10-30 19:56:11 +05:30
jitendra eb327c309b Email template logo issue fixed 2018-10-30 19:50:07 +05:30
jitendra 08ce4064e6 Assets compiled for production 2018-10-30 18:23:32 +05:30
jitendra b67f40ddbc Assets compiled for production 2018-10-30 18:21:11 +05:30
JItendra Singh 864efbce17
Merge pull request #108 from bagisto/rahul
Rahul
2018-10-30 18:18:39 +05:30
jitendra e7ece582f1 Customer address issues fixed 2018-10-30 18:16:40 +05:30
rahul shukla a677d5d553 alert on cart & move to wishlist 2018-10-30 18:14:00 +05:30
jitendra ef462c8793 Merged with master 2018-10-30 17:08:05 +05:30
rahul shukla 84d5ecf41e Merge branch 'master' of https://github.com/bagisto/bagisto into rahul 2018-10-30 17:05:41 +05:30
rahul shukla ea4dcec84d header 2018-10-30 17:03:52 +05:30
prashant-webkul 9369d54a3e Merged and Migration fix 2018-10-30 17:03:13 +05:30
jitendra 376c1f9460 Assets compiled for production 2018-10-30 16:58:53 +05:30
jitendra b4e79a87ca Editor added to the product edit page, slider form page and channel create and edit form 2018-10-30 16:54:24 +05:30
prashant-webkul a792f4e06b Buy Now and Wishlist Complete 2018-10-30 16:52:36 +05:30
JItendra Singh e42feb0fa9
Merge pull request #103 from bagisto/rahul
Rahul
2018-10-30 12:23:32 +05:30
rahul shukla 2517dfbf03 merge with master 2018-10-30 12:19:43 +05:30
JItendra Singh c17961f1bc
Merge pull request #102 from bagisto/jitendra
minicart price currency format fixed
2018-10-30 12:16:40 +05:30
jitendra 7a521f97d7 minicart price currency format fixed 2018-10-30 12:16:08 +05:30
rahul shukla 6fea160abe category image & currency , footer 2018-10-30 12:07:07 +05:30
prashant-webkul 13e56c1930 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-30 11:59:48 +05:30
prashant-webkul f0c5db8177 before merge 2018-10-30 11:59:44 +05:30
jitendra 97c7ca84c6 Dashboard issue fixed 2018-10-30 11:58:15 +05:30
prashant-webkul b55720244c Move Configurable Item To Cart From Wishlist Bug Removed and Storefront UI Fix 2018-10-30 11:49:22 +05:30
prashant-webkul e59f5a775b Order Grid, Wishlist Bug Fixes 2018-10-30 10:01:01 +05:30
prashant-webkul 1cd59b4b86 Webkul copyright text, Search now working on product names only with a dedicated page for displaying results 2018-10-29 14:51:59 +05:30
rahul shukla bcabb00e9a Merge branch 'prashant' of https://github.com/bagisto/bagisto into rahul 2018-10-29 13:06:20 +05:30
rahul shukla 3c0c4481a2 conflict resolve 2018-10-29 13:05:57 +05:30
prashant-webkul cd19e783e0 v-validate issue fixed 2018-10-29 13:04:41 +05:30
rahul shukla 35fdb45353 conflict 2018-10-29 11:44:12 +05:30
prashant-webkul e2c036ced0 Search and Bug fixes 2018-10-29 11:39:09 +05:30
prashant-webkul 2514d748b5 Slider Content Bug Fixed 2018-10-28 18:53:20 +05:30
prashant-webkul 7a157ee17d Slider Backend Fixed 2018-10-28 16:30:15 +05:30
prashant-webkul f5b4cc4c46 tiny mce integration on the way 2018-10-27 19:05:01 +05:30
prashant-webkul a643127eb3 Login page client validation issue fixed, login page wrong sign up translation issue fixed 2018-10-27 17:37:22 +05:30
prashant-webkul 18ff527319 Multiple addresses implemented for customer with the option of making the default address also, new radio button for checkout address selection made 2018-10-27 16:43:57 +05:30
rahul shukla fe0e9a51bf merge with master 2018-10-27 15:54:46 +05:30
rahul shukla da7ab87fa2 customer changes 2018-10-27 15:48:03 +05:30
prashant-webkul 8e2d45e498 TinyMCE integration and Slider Content Fixes 2018-10-26 19:59:24 +05:30
rahul shukla 68e6e5bb79 loader 2018-10-26 19:29:53 +05:30
prashant-webkul 32af436609 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-26 19:15:54 +05:30
prashant-webkul e3ce3ae45d slider fixes 2018-10-26 19:15:51 +05:30
JItendra Singh 7d68e20de6
Merge pull request #93 from bagisto/prashant
Prashant
2018-10-26 19:14:05 +05:30
jitendra 27b1f1fad9 Issues fixed 2018-10-26 19:13:01 +05:30
prashant-webkul 5d3047a0b4 Cart bug fixes and order datagrid bug fixes 2018-10-26 17:53:25 +05:30
prashant-webkul e5e2bf338e Disabled buy now until next merge 2018-10-26 16:47:54 +05:30
jitendra fbe8f844e1 Fixed seeders 2018-10-26 13:54:10 +05:30
jitendra 0231c26da2 Final Commit to first version 2018-10-26 13:16:18 +05:30
JItendra Singh fd399c1661
Merge pull request #88 from bagisto/prashant
Prashant
2018-10-26 13:07:29 +05:30
prashant-webkul 17e4491956 Merged With Master 2018-10-26 13:00:08 +05:30
rahul shukla 80f37ff0cb footer icon 2018-10-26 12:59:37 +05:30
prashant-webkul 74ba1afc64 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-26 12:58:52 +05:30
prashant-webkul d56061539b Bug fixes 2018-10-26 12:58:38 +05:30
jitendra 2d24f24c9c Conflict resolved 2018-10-26 12:54:39 +05:30
rahul shukla d9f4f73a58 conflict 2018-10-26 12:53:37 +05:30
jitendra 9c8c9c2a97 Now compiled asset will store in publishable folder 2018-10-26 12:52:43 +05:30
prashant-webkul d267a5bb27 Bug fixes 2018-10-26 12:40:30 +05:30
prashant-webkul 462dc9fafb Bug Fixes 2018-10-26 12:35:19 +05:30
rahul shukla fef483cb62 footer icon 2018-10-26 12:32:46 +05:30
prashant-webkul 74605cbeff storefront header fixed 2018-10-26 11:57:57 +05:30
rahul shukla 16fece01eb link &n margin on review 2018-10-26 11:32:07 +05:30
jitendra 69ea3a1830 Product grid inventory update implemented after order created 2018-10-26 11:28:24 +05:30
prashant-webkul cc9ad2c8ad Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-26 11:17:24 +05:30
prashant-webkul f69e396bfd Product grid update event bind successful 2018-10-26 11:14:42 +05:30
JItendra Singh d25172baff
Merge pull request #81 from bagisto/jitendra
Issues fixed
2018-10-26 10:24:09 +05:30
jitendra 52bf973307 Issues fixed 2018-10-26 10:23:35 +05:30
rahul shukla 007f945b05 conflict resolve 2018-10-26 09:59:33 +05:30
prashant-webkul d05b6451cc Product grid bug fixes 2018-10-26 09:54:26 +05:30
jitendra cc7b20e607 Merged 2018-10-26 09:51:39 +05:30
rahul shukla c8fd85fe4b conflict resolve 2018-10-26 09:50:46 +05:30
jitendra 7c63dac032 Fixed remaining issues 2018-10-26 09:50:43 +05:30
JItendra Singh ee38c2be7f
Merge pull request #78 from bagisto/prashant
Prashant
2018-10-26 09:50:07 +05:30
prashant-webkul 7e75da7bdf Product datagrid event binded with product create 2018-10-26 09:49:19 +05:30
rahul shukla 781b960fa8 reviews issue 2018-10-25 21:45:28 +05:30
prashant-webkul 021d918937 product datagrid event binding 2018-10-25 19:35:28 +05:30
prashant-webkul 55f6e2f29a left with only the save product function for creating products datagrid 2018-10-25 19:29:34 +05:30
JItendra Singh 99a0590c69
Merge pull request #77 from bagisto/rahul
Rahul
2018-10-25 15:35:27 +05:30
prashant-webkul dc939d4ff2 Addition data for adding configurable product to cart, fixed 2018-10-25 15:33:49 +05:30