Commit Graph

345 Commits

Author SHA1 Message Date
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 b7d15d4d0e validatio issue 2019-01-11 10:39:41 +05:30
rahul shukla 1e2d7418ca merge with master 2019-01-04 19:13:53 +05:30
rahul shukla 33ac4c1319 multiselect for configuration 2019-01-04 11:13:24 +05:30
rahul shukla b430d4d4b5 merge with master 2019-01-02 20:15:05 +05:30
rahul shukla 29ab4f1da9 merge with master 2018-12-31 18:51:42 +05:30
jitendra c49e7b6e5f Channel alter migration issue fixed 2018-12-31 18:49:06 +05:30
rahul shukla 96b7f05c23 bagisto installer , #399 #400 #382 #301 #344 #214 #359 #223 #138 issue fixed 2018-12-31 17:27:32 +05:30
jitendra cb3da5fc08 Channel root category feature added 2018-12-31 16:34:26 +05:30
jitendra 9581082f56 Removed auth middleware from controllers 2018-12-27 17:05:05 +05:30
jitendra 336284ee6e Refactor state grouping by country 2018-12-27 11:35:10 +05:30
jitendra 6b2b054f97 Get config for shipping and payment method updated 2018-12-26 18:52:44 +05:30
jitendra 0b3ba4f06a Modified inventory selection during shipment creation 2018-12-26 18:34:49 +05:30
jitendra 2e668c7020 Inventory source selection feature added during shipment creation 2018-12-26 15:30:23 +05:30
rahul shukla 1e25226997 Merge branch 'master' of https://github.com/bagisto/bagisto into rahul 2018-12-26 14:47:50 +05:30
rahul shukla 9bb9ae5ce7 configuration changes 2018-12-26 14:46:27 +05:30
jitendra 5916482f7c Add fire event on every controller 2018-12-21 18:18:34 +05:30
jitendra 17480d8b67 Issue #365 2018-12-21 13:25:58 +05:30
jitendra 954502c571 Issues #353, #354 2018-12-21 11:58:02 +05:30
jitendra 9654748f1f Issue #348 fixed 2018-12-20 16:24:30 +05:30
prashant-webkul 0faf88a797 Issue fixed #329, admin changing their details with entering the current password 2018-12-19 13:36:33 +05:30
prashant-webkul 3c8807e7e9 merge conflicts removed 2018-12-18 18:17:01 +05:30
rahul shukla 9cdc16a50b conflict resolve 2018-12-18 13:39:15 +05:30
prashant-webkul c4416bc228 Removed conflicts from the merge with the master 2018-12-18 11:09:54 +05:30
rahul shukla b298a3973a validation in shipping & payment methods and issue #308 & #295 2018-12-14 15:26:01 +05:30
jitendra 2decdeb194 Removed event from menu, acl, config creation 2018-12-14 13:56:05 +05:30
rahul shukla 8cd04be89c shipping & payment methods 2018-12-14 11:56:52 +05:30
prashant-webkul d9f0ddc89d Fixed issues 314 and 315 2018-12-13 18:51:54 +05:30
jitendra 0bdd9e1a2a Refactor Menu system and core config data system 2018-12-13 16:28:28 +05:30
jitendra 7f65c3327a Modify menu system and added decimal validator 2018-12-12 15:09:20 +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
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
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
prashant-webkul 7fb67dc161 mass operations and datagrid operations normalization 2018-11-30 20:37:41 +05:30
prashant-webkul 5f81a79796 Subscription newsletter migration restored and subsctiption newsletter datagrid in admin 2018-11-29 18:05:56 +05:30
prashant-webkul 311701b00a tax category sync fix and select rates fixed 2018-11-28 14:05:44 +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
jitendra fb0079bf42 Fixed validation error messages 2018-11-27 10:16:35 +05:30
prashant-webkul 1c27444705 merged 2018-11-21 12:04:54 +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 c845fdddb8 Issues fixed 2018-11-13 15:43:09 +05:30
prashant-webkul 3a801a5d72 Pre Loaded 2018-11-05 10:25:05 +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 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
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
jitendra 9c8c9c2a97 Now compiled asset will store in publishable folder 2018-10-26 12:52:43 +05:30
rahul shukla 007f945b05 conflict resolve 2018-10-26 09:59:33 +05:30
jitendra 7c63dac032 Fixed remaining issues 2018-10-26 09:50:43 +05:30
rahul shukla 781b960fa8 reviews issue 2018-10-25 21:45:28 +05:30
jitendra 930cba9436 Issues fixed 2018-10-25 13:16:45 +05:30
jitendra 0f6bcfde49 Seeders added 2018-10-25 11:01:47 +05:30
rahul shukla de0ea34e8a conflict resolve 2018-10-23 17:24:27 +05:30
prashant-webkul 2c32f510b2 merged with master 2018-10-23 17:19:13 +05:30
JItendra Singh 56e8597c6f
Merge pull request #68 from bagisto/jitendra
Dashboard completed
2018-10-23 17:16:22 +05:30
jitendra 13ae5d58c0 Dashboard completed 2018-10-23 17:15:44 +05:30
rahul shukla 399ba55982 Merge branch 'master' of https://github.com/bagisto/bagisto into rahul 2018-10-22 11:18:29 +05:30
rahul shukla 5dc60d0fe1 customer group 2018-10-22 11:17:42 +05:30
prashant-webkul 806ffb460f Order Datagrid, Datagrid Currency Capabilities via wrapper and UI fixes in storefront navigation bar, admin panel menu item, datagrid actions checks before rendering of datagrid 2018-10-18 16:34:55 +05:30
prashant-webkul 40ecc72b04
Merge pull request #67 from bagisto/jitendra
Jitendra
2018-10-18 15:52:22 +05:30
jitendra 1d5e1f5a21 Cart issues fixed 2018-10-18 15:21:08 +05:30
JItendra Singh 6c0dfa6a96
Merge pull request #65 from bagisto/jitendra
Front currency switcher, currency edit page and locale edit page added
2018-10-18 13:49:45 +05:30
jitendra 12d68fcb57 Front currency switcher, currency edit page and locale edit page added 2018-10-18 13:49:03 +05:30
rahul shukla b5be4cf320 Merge branch 'master' of https://github.com/bagisto/bagisto into rahul 2018-10-18 10:33:45 +05:30
rahul shukla dde2a626e6 laoder changes 2018-10-18 10:33:00 +05:30
prashant-webkul 3a1029290f Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-17 19:50:55 +05:30
prashant-webkul 8c7626b2b2 before merge 2018-10-17 19:50:25 +05:30
jitendra b02d87626a Get current channel code updated 2018-10-17 19:27:51 +05:30
prashant-webkul 84bc6c0c60 merged 2018-10-17 16:17:46 +05:30
prashant-webkul 11e7db8f85 Before merge with masteer 2018-10-17 16:03:57 +05:30
jitendra b0a12d85a3 COnflict resloved 2018-10-17 16:03:25 +05:30
jitendra faab00c3b8 Bug fixed 2018-10-17 16:00:31 +05:30
rahul shukla 541264f86a Merge branch 'master' of https://github.com/bagisto/bagisto into rahul 2018-10-17 15:16:35 +05:30
jitendra 892bf53cc9 Channel logo and favicon implementation added 2018-10-17 15:15:18 +05:30
rahul shukla b329567370 conflict 2018-10-17 15:14:22 +05:30
rahul shukla 8009b5c647 error & loader 2018-10-17 13:10:08 +05:30
jitendra d3b73f517c Sales email templates added 2018-10-17 12:51:47 +05:30
rahul shukla ec03cbd63e conflict resolve 2018-10-15 16:16:50 +05:30
jitendra 7f1675e37c Order cancel implemented 2018-10-15 16:09:09 +05:30
rahul shukla 5cc562d972 reviews 2018-10-15 14:32:26 +05:30
jitendra e92010f55f Tax issue fixed 2018-10-12 18:34:15 +05:30
jitendra 1e16931ba3 Countries and States models added 2018-10-12 18:24:10 +05:30
rahul shukla c857dde9f4 customer validation 2018-10-12 17:09:19 +05:30
rahul shukla 8544d9705a conflict 2018-10-12 17:01:14 +05:30
prashant-webkul 7319a8c40a Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-12 13:53:22 +05:30
jitendra 71ea17d9d7 Performence Optimized 2018-10-12 13:52:06 +05:30
prashant-webkul f28f716d9f Bug fixes across the system 2018-10-11 19:55:59 +05:30
prashant-webkul d26758e49a Merged 2018-10-10 16:13:51 +05:30
jitendra 426933a4bb Home new products 2018-10-10 11:20:47 +05:30
prashant-webkul b6df4e1dc8 Merged with master 2018-10-10 10:19:30 +05:30
prashant-webkul 36102ac040 Bug fixes in tax rate and categories 2018-10-09 17:34:25 +05:30
jitendra d00bb078a1 Shipment and invoice creation completed 2018-10-09 17:32:22 +05:30
jitendra c235c22e79 Order creation 2018-10-04 12:12:06 +05:30
prashant-webkul a794aa0b44 Before merge for cart 2018-09-27 15:37:54 +05:30
jitendra 19775a4017 Checkout review page added 2018-09-27 13:23:26 +05:30
prashant-webkul d14db9455e cart's implementation now moving towards normalized forms and improved the database structure for cart and cartitems table. 2018-09-26 19:58:32 +05:30
jitendra de842320f0 Checkout review page added 2018-09-26 15:49:18 +05:30
rahul shukla 3b29f8d501 filter & sort 2018-09-25 19:14:46 +05:30
prashant-webkul 26de50bc46 Fixed bugs and made way for exisiting features of cart to be implemented in new future 2018-09-25 14:07:34 +05:30
rahul shukla 3c9153be87 Merge branch 'prashant' of https://github.com/bagisto/bagisto into rahul 2018-09-24 16:12:10 +05:30
rahul shukla 335f27e1f6 review issues 2018-09-21 19:13:41 +05:30
prashant-webkul 174ab21fa7 Changed the cart to session dependent code only 2018-09-21 18:57:27 +05:30
jitendra facf3de81a Checkout shipping and payment steps added 2018-09-21 15:47:01 +05:30
prashant-webkul 2474f5c787 merged with master 2018-09-20 15:37:44 +05:30
jitendra 31ae7c025e Check process 2018-09-20 15:31:51 +05:30
prashant-webkul 2721080a1b Just add more logics to cart and cart items from here 2018-09-20 14:03:28 +05:30
jitendra acd048aaf6 Checkout page 2018-09-19 12:28:15 +05:30
rahul shukla 94eb52389e product-detail 2018-09-15 15:19:58 +05:30
prashant-webkul b22e82b8cf Mergingchanges 2018-09-13 17:20:12 +05:30
prashant-webkul 0222c97a53 Merging changes with master 2018-09-13 16:57:13 +05:30
rahul shukla 87e5e9a2bc checkout process 2018-09-13 16:46:47 +05:30
prashant-webkul ac093c465b Cart Module being modified accodrding to session 2018-09-13 16:36:17 +05:30
jitendra 160f92b542 Product detail page completed 2018-09-13 16:34:56 +05:30
rahul shukla b082d73707 customer edit/add & show in admin 2018-09-11 09:41:48 +05:30
jitendra 4fb084557d Commit to master 2018-09-10 15:04:57 +05:30
prashant-webkul 40e04abddf On the new origin 2018-09-10 15:01:34 +05:30
rahul shukla d0e0b64445 merge conflict 2018-09-08 14:22:46 +05:30
rahul shukla 149c98ff03 customer & review 2018-09-08 14:11:36 +05:30
prashant-webkul e07be27d8b Merged with master 2018-09-06 12:19:22 +05:30
prashant-webkul 29d83d7b5f Cart Packages files 2018-09-06 11:50:30 +05:30
prashant-webkul 888dfc6b0f Tax Module completed 2018-09-05 16:26:42 +05:30
prashant-webkul 4cf6ab5f00 Tax Module Completed with just edit form left. 2018-09-04 14:44:32 +05:30
prashant-webkul df199f0728 Taxes, long intended routes, ACL now prevents login if user already logged in. 2018-08-31 11:33:11 +05:30
jitendra 0c8b5a03e2 Product details page added 2018-08-30 18:52:15 +05:30
prashant-webkul 1bff70bd7b Customer Account Section Mostly Completed Upto 80% 2018-08-23 18:41:56 +05:30
jitendra bc087010ee Repository pattern changes 2018-08-22 15:14:35 +05:30
jitendra 7e95b89ec8 For demo 2018-08-21 16:28:55 +05:30
prashant-webkul e480a7c625 Slider on store front implemented with html content, css and transition animations left 2018-08-09 17:30:26 +05:30
prashant-webkul 4b6bb9540f Merged with master 2018-08-09 10:06:51 +05:30
jitendra ff50784aa8 Added product creation page 2018-08-09 10:05:13 +05:30
prashant-webkul 8406da969d Slider layers now working, datagrid on slider working 2018-08-08 19:17:40 +05:30
prashant-webkul 3fa134ca16 Datagrid Integration in Settings done. 2018-08-08 15:07:04 +05:30
prashant-webkul 7c5253aec2 Slider Configuration in works ready to save slider images in next commit 2018-08-03 20:20:13 +05:30
prashant-webkul ec8fdeca6f data grid empty values in filters redirecting to exception is now fixed. 2018-08-02 12:59:54 +05:30
prashant-webkul 9e3c3a357a Front category navigation and store front account dropdown complete 2018-08-01 20:30:31 +05:30
jitendra f236da61ab Added Repository Pattern to User 2018-07-31 13:20:54 +05:30
jitendra 5f7c432dc5 Channel and families completed 2018-07-27 11:52:12 +05:30
jitendra 3a7ab61082 Currency, Exchange Rate completed 2018-07-24 16:41:32 +05:30
jitendra c87f71427a Attribute Family Feature Added 2018-07-17 18:58:34 +05:30
jitendra 30a5784d75 Attribute Package Added 2018-07-11 11:11:27 +05:30