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

709 Commits

Author SHA1 Message Date
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
prashant-webkul ef37be5eca Merge with master 2018-10-25 15:26:24 +05:30
jitendra 210da46a12 Issue fixed 2018-10-25 15:25:10 +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 d1e49a2170 logo-img 2018-10-25 10:56:03 +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 Singh 2cdf0aedf0
Merge pull request #71 from bagisto/prashant 
Prashant
 2018-10-25 10:19:06 +05:30
prashant-webkul b055a65d24 Customer password reset route 2018-10-25 10:18:14 +05:30
jitendra c8e8240080 Merged Changes 2018-10-25 10:16:55 +05:30
rahul shukla 832d75485f product review 2018-10-25 10:13:26 +05:30
jitendra a95f56325c Issue fixed 2018-10-25 09:44:23 +05:30
prashant-webkul ec1ade3f57 Product Grid Autosync on Product Update Done 2018-10-23 18:47:28 +05:30
rahul shukla de0ea34e8a conflict resolve 2018-10-23 17:24:27 +05:30
rahul shukla 489c1cdd1b customer group & responsive 2018-10-23 17:21:04 +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 1c78140272 Made the way to add configurable product to wishlist on the storefront. 2018-10-18 18:13:45 +05:30
prashant-webkul 371d2bb742 Wrote the code for moving configurable product to the wishlist 2018-10-18 17:42:41 +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
jitendra 70c47f44a9 Fixed cart issues 2018-10-18 15:01:19 +05:30
prashant-webkul 0b1f362d4b Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-18 14:00:31 +05:30
JItendra Singh 053b72e015
Merge pull request #66 from bagisto/jitendra 
Badge css added in Ui
 2018-10-18 13:59:16 +05:30
jitendra ad2fa3a678 Badge css added in Ui 2018-10-18 13:58:35 +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 e91d6f184b loader css change 2018-10-18 11:00:04 +05:30
JItendra Singh e2229bc634
Merge pull request #63 from bagisto/prashant 
Prashant
 2018-10-18 10:46:46 +05:30
rahul shukla 7fe85d0549 loader changes 2018-10-18 10:45:35 +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
jitendra ef69538ccb Refactor css 2018-10-18 10:25:45 +05:30
prashant-webkul c670891b4f Customer Password Resets Migration File 2018-10-17 20:01:12 +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 2a96a3ee71 merge master 2018-10-17 15:18:34 +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
prashant-webkul 3a17aacd90 Wishlist Move To Cart For Simple Products Done 2018-10-15 20:18:58 +05:30
prashant-webkul 2f427d1550 After merge 2018-10-15 17:21:03 +05:30
prashant-webkul 8784fffe92 before merge 2018-10-15 17:19:28 +05:30
rahul shukla ec03cbd63e conflict resolve 2018-10-15 16:16:50 +05:30
rahul shukla f1a0a2bcda order 2018-10-15 16:15:29 +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
prashant-webkul 2613f9b93f Account pages for the customer fixed 2018-10-15 14:07:29 +05:30
rahul shukla 8717edf059 customer pannel 2018-10-15 13:52:27 +05:30
prashant-webkul 4bd252edde Customer account layout bug fixes 2018-10-15 13:51:42 +05:30
prashant-webkul f5188d4b83 Customer account styles generalized 2018-10-15 13:50:37 +05:30
rahul shukla ba2ad4bd28 customer fixes 2018-10-15 10:22:00 +05:30
prashant-webkul 1bf6ce539e Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-12 18:35:04 +05:30
jitendra e92010f55f Tax issue fixed 2018-10-12 18:34:15 +05:30
prashant-webkul b33d7c1aa1 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 
Countries and States list component to be devised for system wide usage.
 2018-10-12 18:24:58 +05:30
prashant-webkul a7e813ff0d Before merge 2018-10-12 18:24:13 +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 676aeb3217 UI and System fixes 2018-10-12 16:45:55 +05:30
prashant-webkul 7319a8c40a Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-12 13:53:22 +05:30
prashant-webkul 0c47cbc282 Bug fixes 2018-10-12 13:52:21 +05:30
jitendra 71ea17d9d7 Performence Optimized 2018-10-12 13:52:06 +05:30
prashant-webkul a631a07674 Bug fixes and cart operations optimization 2018-10-12 12:51:39 +05:30
prashant-webkul 9df49c07d3 Merge branch 'master' of https://github.com/bagisto/bagisto into prashant 2018-10-12 09:55:48 +05:30