merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,455 Commits 1 Branch 0 Tags 196 MiB
Commit Graph

542 Commits

Author SHA1 Message Date
rahul shukla 0bf6699746 issues fixes #320 #288 #309 2019-01-02 20:12:49 +05:30
rahul shukla 29ab4f1da9 merge with master 2018-12-31 18:51:42 +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 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 95161d9101 changes in config 2018-12-26 14:59:52 +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
Prashant Singh 232e430ab0 fixed issue #319 2018-12-22 16:15:23 +05:30
Prashant Singh affcca3d08 fixed issue #304 2018-12-22 16:12:42 +05:30
Prashant Singh e526af061e Fixed issues #378, #379 and #373 2018-12-22 15:02:10 +05:30
Prashant Singh 81da5bd1d1 Changed the product card hover style and fixed issue #369 2018-12-22 11:56:26 +05:30
jitendra f4ca5a5b34 Compiled assets for production 2018-12-21 18:54:07 +05:30
Prashant Singh 089aaadb71 merge conflicts removed 2018-12-21 18:35:23 +05:30
jitendra 5916482f7c Add fire event on every controller 2018-12-21 18:18:34 +05:30
Prashant Singh 6fba17ea81 Fixed issues #300 & Updated inventory in product grid after order received 2018-12-21 16:14:20 +05:30
Prashant Singh 54a268302b fixed issue #354 2018-12-21 14:05:52 +05:30
jitendra 64e451d7f9 Issue #367 fixed 2018-12-21 13:57:58 +05:30
jitendra 954502c571 Issues #353, #354 2018-12-21 11:58:02 +05:30
jitendra 8b18b78663 Assets compiled for production 2018-12-20 18:26:18 +05:30
rahul shukla 405e8bfecb issue resolved 2018-12-20 18:20:52 +05:30
rahul shukla ef72b4d629 export button & review 2018-12-20 16:38:47 +05:30
jitendra 9654748f1f Issue #348 fixed 2018-12-20 16:24:30 +05:30
rahul shukla 13258deb0c lang added 2018-12-20 13:55:15 +05:30
rahul shukla b8752e31bc Merge branch 'master' of https://github.com/bagisto/bagisto into rahul 2018-12-20 13:37:16 +05:30
rahul shukla b832dc3a4a review changes 2018-12-20 13:37:03 +05:30
jitendra 0769eb9a41 Unnecessary border removed from every admin page and added view icon in order shipping, invoice list in order view page 2018-12-19 16:01:56 +05:30
jitendra c943fa3603 Compile assets from production 2018-12-19 15:05:23 +05:30
jitendra 0cf2fc4baf Issues fixed 2018-12-19 15:00:40 +05:30
prashant-webkul dfb4e5f210 subscription exception issue #337 fixed 2018-12-19 14:57:44 +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 95d6d849f4 Fixed issue and modified issue fix #333 #332 and #326 2018-12-19 12:20:43 +05:30
prashant-webkul 3c8807e7e9 merge conflicts removed 2018-12-18 18:17:01 +05:30
prashant-webkul 489dcf0b54 Bugs and issues resolvements 2018-12-18 16:14:21 +05:30
jitendra 40fafca930 Configuration redirect to first config page fixed 2018-12-18 13:41:25 +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 e3e80dde1e #305 & #298 2018-12-14 17:36:49 +05:30
rahul shukla b298a3973a validation in shipping & payment methods and issue #308 & #295 2018-12-14 15:26:01 +05:30
jitendra 9a699a64e5 Modified config creation 2018-12-14 15:02:59 +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 15135d64d7 Fixed menu sort issue 2018-12-12 16:26:20 +05:30
jitendra 7f65c3327a Modify menu system and added decimal validator 2018-12-12 15:09:20 +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 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 e29c5f39f0 Issues #286, #284, #279, #277, #276, #273, #270, #279, #226, #182, #165 2018-12-06 17:29:26 +05:30
rahul shukla 4201a1ec48 export completed 2018-12-04 11:52:01 +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 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
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 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 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 e1b2d1eb01 export for customer 2018-11-29 17:39:39 +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
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 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 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
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 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 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
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 9ce3e53914 Fixed Bug in Tax Module 2018-11-23 16:22:19 +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
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 8c12e35621 Cart Refactored, Email Subscription, UI Bug Fix, Wishlist Order & Invoices Datagrid 2018-11-16 17:21:10 +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
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 ef462c8793 Merged with master 2018-10-30 17:08: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
rahul shukla 2517dfbf03 merge with master 2018-10-30 12:19:43 +05:30
prashant-webkul 13e56c1930 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-30 11:59:48 +05:30
jitendra 97c7ca84c6 Dashboard issue fixed 2018-10-30 11:58:15 +05:30
prashant-webkul e59f5a775b Order Grid, Wishlist Bug Fixes 2018-10-30 10:01:01 +05:30
rahul shukla 3c0c4481a2 conflict resolve 2018-10-29 13:05:57 +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 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
prashant-webkul 8e2d45e498 TinyMCE integration and Slider Content Fixes 2018-10-26 19:59:24 +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
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
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 462dc9fafb Bug Fixes 2018-10-26 12:35:19 +05:30
rahul shukla fef483cb62 footer icon 2018-10-26 12:32:46 +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
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 ef37be5eca Merge with master 2018-10-25 15:26:24 +05:30
rahul shukla 84ba1d4fc6 error changes 2018-10-25 14:36:51 +05:30
rahul shukla af5b9d9f06 conflict resolve 2018-10-25 13:58:06 +05:30
prashant-webkul 1b83b23e53 merged with conflicted assets, recompile storefront 2018-10-25 13:51:03 +05:30
rahul shukla c9037806b0 error pages 2018-10-25 13:50:30 +05:30
prashant-webkul 683b18e424 Cart Bug Fixes and Category items fixes for visible in menu only 2018-10-25 13:49:23 +05:30
rahul shukla f281d01a53 error pages 2018-10-25 13:37:21 +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 8d9627c194 customer changes 2018-10-25 10:38:51 +05:30
rahul shukla 52999c971e Merge branch 'master' of https://github.com/bagisto/bagisto into rahul 2018-10-25 10:19:17 +05:30
jitendra c8e8240080 Merged Changes 2018-10-25 10:16:55 +05:30
jitendra a95f56325c Issue fixed 2018-10-25 09:44:23 +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
prashant-webkul 96b40bf2c3 Products DataGrid 2018-10-23 17:16:00 +05:30
jitendra 13ae5d58c0 Dashboard completed 2018-10-23 17:15:44 +05:30
prashant-webkul 5016e03b1c Products datagrid mechanism is normailized to single table due to greate overhead in fetching total attributes for products. 2018-10-22 18:48:46 +05:30
prashant-webkul 701c8e3602 Wishlist move to cart code is tested and its working fine 2018-10-22 16:10:05 +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 d33b5c276e Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-18 15:52:47 +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
prashant-webkul 6865545172 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-18 13:50:46 +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 bd752c7e3e conflict 2018-10-18 12:55:00 +05:30
prashant-webkul db2b647de3 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-18 12:45:36 +05:30
prashant-webkul 51026b0dfd Mergin 2018-10-18 12:45:32 +05:30
JItendra Singh 14140d647a
Merge pull request #64 from bagisto/jitendra 
user on 404 page fixed
 2018-10-18 11:55:13 +05:30
jitendra 258262935a user on 404 page fixed 2018-10-18 11:54:36 +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
jitendra 9756480f42 Theme issue fixed 2018-10-17 16:17:03 +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 Singh db0f32ac37
Merge pull request #57 from bagisto/jitendra 
Channel logo and favicon implementation added
 2018-10-17 15:16:01 +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
prashant-webkul 5fb2f78039 Merged with Master 2018-10-17 12:56:34 +05:30
prashant-webkul 3a3c89484d before merge 2018-10-17 12:53:01 +05:30
jitendra d3b73f517c Sales email templates added 2018-10-17 12:51:47 +05:30
prashant-webkul c05ea63603 Before Merge 2018-10-17 12:30:48 +05:30
prashant-webkul ddc57abdfa Datagrid UI and Configuration fixes 2018-10-17 11:27:40 +05:30
prashant-webkul f195b335b6 Data Grid Configuration Fixes 2018-10-16 18:56:30 +05:30
prashant-webkul 91a4fabcfb Grid Sort Fixes 2018-10-16 17:18:45 +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
rahul shukla ba2ad4bd28 customer fixes 2018-10-15 10:22:00 +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
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
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 ac39fca00e responsive 2018-09-22 15:42:23 +05:30
rahul shukla 335f27e1f6 review issues 2018-09-21 19:13:41 +05:30
rahul shukla a120adf10e customer edit 2018-09-21 11:29:22 +05:30
jitendra acd048aaf6 Checkout page 2018-09-19 12:28:15 +05:30
prashant-webkul b22e82b8cf Mergingchanges 2018-09-13 17:20:12 +05:30
rahul shukla 87e5e9a2bc checkout process 2018-09-13 16:46:47 +05:30
rahul shukla 1be2127591 checkout process 2018-09-13 16:40:45 +05:30
prashant-webkul 4e7b1f157b Merged with master 2018-09-12 12:27:01 +05:30
jitendra 9731b499d4 Conflicts resolve 2018-09-11 16:10:57 +05:30