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

415 Commits

Author SHA1 Message Date
jitendra bc67fe761a Buy now and add to whislist issue fixed 2018-10-31 12:52:27 +05:30
jitendra eb327c309b Email template logo issue fixed 2018-10-30 19:50:07 +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
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 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 f0c5db8177 before merge 2018-10-30 11:59:44 +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 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 d56061539b Bug fixes 2018-10-26 12:58:38 +05:30
rahul shukla d9f4f73a58 conflict 2018-10-26 12:53:37 +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
rahul shukla 007f945b05 conflict resolve 2018-10-26 09:59:33 +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
rahul shukla 781b960fa8 reviews issue 2018-10-25 21:45:28 +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 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
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
rahul shukla d1e49a2170 logo-img 2018-10-25 10:56:03 +05:30
rahul shukla 52999c971e Merge branch 'master' of https://github.com/bagisto/bagisto into rahul 2018-10-25 10:19:17 +05:30
prashant-webkul b055a65d24 Customer password reset route 2018-10-25 10:18:14 +05:30
rahul shukla 832d75485f product review 2018-10-25 10:13:26 +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
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 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 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 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 f28f716d9f Bug fixes across the system 2018-10-11 19:55:59 +05:30
rahul shukla 247bb41812 conflict 2018-10-11 16:23:23 +05:30
rahul shukla 5a71127c4e Merge branch 'prashant' of https://github.com/bagisto/bagisto into rahul 2018-10-11 15:23:44 +05:30
rahul shukla b6fda43b38 conflict 2018-10-11 15:23:29 +05:30
prashant-webkul 2378d2bdd2 layout changes 2018-10-11 15:22:25 +05:30
prashant-webkul 60c930c401 Merged w/ master 2018-10-11 11:12:17 +05:30
jitendra 392ceadf53 Refactor cart 2018-10-11 11:09:17 +05:30
prashant-webkul d26758e49a Merged 2018-10-10 16:13:51 +05:30
prashant-webkul 34d4a1c3a4 Before Merge 2018-10-10 16:11:33 +05:30
jitendra 6f57a51152 Fixed cart issues 2018-10-10 15:56:27 +05:30