[hub][api] Update save and view api to be user specific
diff --git a/erpnext/public/js/hub/components/detail_view.js b/erpnext/public/js/hub/components/detail_view.js
deleted file mode 100644
index d80720c..0000000
--- a/erpnext/public/js/hub/components/detail_view.js
+++ /dev/null
@@ -1,138 +0,0 @@
-import { get_rating_html } from './reviews';
-
-function get_detail_view_html(item, allow_edit) {
- const title = item.item_name || item.name;
- const seller = item.company;
-
- const who = __('Posted By {0}', [seller]);
- const when = comment_when(item.creation);
-
- const city = item.city ? item.city + ', ' : '';
- const country = item.country ? item.country : '';
- const where = `${city}${country}`;
-
- const dot_spacer = '<span aria-hidden="true"> · </span>';
-
- const description = item.description || '';
-
- let stats = __('No views yet');
- if(item.view_count) {
- const views_message = __(`${item.view_count} Views`);
-
- const rating_html = get_rating_html(item.average_rating);
- const rating_count = item.no_of_ratings > 0 ? `${item.no_of_ratings} reviews` : __('No reviews yet');
-
- stats = `${views_message}${dot_spacer}${rating_html} (${rating_count})`;
- }
-
- let favourite_button = ''
- if (hub.settings.registered) {
- favourite_button = !item.favourited
- ? `<button class="btn btn-default text-muted favourite-button" data-action="add_to_favourites">
- ${__('Save')} <i class="octicon octicon-heart text-extra-muted"></i>
- </button>`
- : `<button class="btn btn-default text-muted favourite-button disabled" data-action="add_to_favourites">
- ${__('Saved')}
- </button>`;
- }
-
- const contact_seller_button = item.hub_seller !== hub.settings.company_email
- ? `<button class="btn btn-primary" data-action="contact_seller">
- ${__('Contact Seller')}
- </button>`
- : '';
-
- let menu_items = '';
-
- if(allow_edit) {
- menu_items = `
- <li><a data-action="edit_details">${__('Edit Details')}</a></li>
- <li><a data-action="unpublish_item">${__('Unpublish')}</a></li>`;
- } else {
- menu_items = `
- <li><a data-action="report_item">${__('Report this item')}</a></li>
- `;
- }
-
- const html = `
- <div class="hub-item-container">
- <div class="row visible-xs">
- <div class="col-xs-12 margin-bottom">
- <button class="btn btn-xs btn-default" data-route="marketplace/home">${__('Back to home')}</button>
- </div>
- </div>
- <div class="row detail-page-section margin-bottom">
- <div class="col-md-3">
- <div class="hub-item-image">
- <img src="${item.image}">
- </div>
- </div>
- <div class="col-md-8 flex flex-column">
- <div class="detail-page-header">
- <h2>${title}</h2>
- <div class="text-muted">
- <p>${where}${dot_spacer}${when}</p>
- <p>${stats}</p>
- </div>
- </div>
-
- <div class="page-actions detail-page-actions">
- ${favourite_button}
- ${contact_seller_button}
- </div>
- </div>
- <div class="col-md-1">
- <div class="dropdown pull-right hub-item-dropdown">
- <a class="dropdown-toggle btn btn-xs btn-default" data-toggle="dropdown">
- <span class="caret"></span>
- </a>
- <ul class="dropdown-menu dropdown-right" role="menu">
- ${menu_items}
- </ul>
- </div>
- </div>
- </div>
- <div class="row hub-item-description">
- <h6 class="col-md-12 margin-top">
- <b class="text-muted">Item Description</b>
- </h6>
- <p class="col-md-12">
- ${description ? description : __('No details')}
- </p>
- </div>
- <div class="row hub-item-seller">
-
- <h6 class="col-md-12 margin-top margin-bottom">
- <b class="text-muted">Seller Information</b>
- </h6>
- <div class="col-md-1">
- <img src="https://picsum.photos/200">
- </div>
- <div class="col-md-8">
- <div class="margin-bottom"><a href="#marketplace/seller/${seller}" class="bold">${seller}</a></div>
- </div>
- </div>
- <!-- review area -->
- <div class="row hub-item-review-container">
- <div class="col-md-12 form-footer">
- <div class="form-comments">
- <div class="timeline">
- <div class="timeline-head"></div>
- <div class="timeline-items"></div>
- </div>
- </div>
- <div class="pull-right scroll-to-top">
- <a onclick="frappe.utils.scroll_to(0)"><i class="fa fa-chevron-up text-muted"></i></a>
- </div>
- </div>
- </div>
- </div>
- `;
-
- return html;
-}
-
-export {
- get_detail_view_html,
- get_profile_html
-}
diff --git a/erpnext/public/js/hub/components/item_card.js b/erpnext/public/js/hub/components/item_card.js
deleted file mode 100644
index 41ab33a..0000000
--- a/erpnext/public/js/hub/components/item_card.js
+++ /dev/null
@@ -1,80 +0,0 @@
-function get_buying_item_message_card_html(item) {
- const item_name = item.item_name || item.name;
- const title = strip_html(item_name);
-
- const message = item.recent_message
- const sender = message.sender === frappe.session.user ? 'You' : message.sender
- const content = strip_html(message.content)
-
- // route
- item.route = `marketplace/buying/${item.name}`
-
- const item_html = `
- <div class="col-md-7">
- <div class="hub-list-item" data-route="${item.route}">
- <div class="hub-list-left">
- <img class="hub-list-image" src="${item.image}">
- <div class="hub-list-body ellipsis">
- <div class="hub-list-title">${item_name}</div>
- <div class="hub-list-subtitle ellipsis">
- <span>${sender}: </span>
- <span>${content}</span>
- </div>
- </div>
- </div>
- <div class="hub-list-right">
- <span class="text-muted">${comment_when(message.creation, true)}</span>
- </div>
- </div>
- </div>
- `;
-
- return item_html;
-}
-
-function get_selling_item_message_card_html(item) {
- const item_name = item.item_name || item.name;
- const title = strip_html(item_name);
-
- // route
- if (!item.route) {
- item.route = `marketplace/item/${item.name}`
- }
-
- let received_messages = '';
- item.received_messages.forEach(message => {
- const sender = message.sender === frappe.session.user ? 'You' : message.sender
- const content = strip_html(message.content)
-
- received_messages += `
- <div class="received-message">
- <span class="text-muted">${comment_when(message.creation, true)}</span>
- <div class="ellipsis">
- <span class="bold">${sender}: </span>
- <span>${content}</span>
- </div>
- </div>
- `
- });
-
- const item_html = `
- <div class="selling-item-message-card">
- <div class="selling-item-detail" data-route="${item.route}">
- <img class="item-image" src="${item.image}">
- <h5 class="item-name">${item_name}</h5>
- <div class="received-message-container">
- ${received_messages}
- </div>
- </div>
- </div>
- `;
-
- return item_html;
-}
-
-export {
- get_item_card_html,
- get_local_item_card_html,
- get_buying_item_message_card_html,
- get_selling_item_message_card_html
-}
diff --git a/erpnext/public/js/hub/pages/Item.vue b/erpnext/public/js/hub/pages/Item.vue
index 3305b1d..5d07bcd 100644
--- a/erpnext/public/js/hub/pages/Item.vue
+++ b/erpnext/public/js/hub/pages/Item.vue
@@ -190,9 +190,9 @@
},
add_to_saved_items() {
- hub.call('add_item_to_seller_saved_items', {
+ hub.call('add_item_to_user_saved_items', {
hub_item_name: this.hub_item_name,
- hub_seller: hub.settings.company_email
+ hub_user: frappe.session.user
})
.then(() => {
const saved_items_link = `<b><a href="#marketplace/saved-items">${__('Saved')}</a></b>`
diff --git a/erpnext/public/js/hub/pages/Profile.vue b/erpnext/public/js/hub/pages/Profile.vue
index a0bc6cb..91ed946 100644
--- a/erpnext/public/js/hub/pages/Profile.vue
+++ b/erpnext/public/js/hub/pages/Profile.vue
@@ -52,7 +52,7 @@
get_profile() {
hub.call(
'get_hub_seller_profile',
- { hub_seller: hub.settings.company_email }
+ { hub_seller: hub.settings.hub_seller_name }
).then(profile => {
this.init = false;
diff --git a/erpnext/public/js/hub/pages/SavedItems.vue b/erpnext/public/js/hub/pages/SavedItems.vue
index e5d21cd..c29675a 100644
--- a/erpnext/public/js/hub/pages/SavedItems.vue
+++ b/erpnext/public/js/hub/pages/SavedItems.vue
@@ -38,7 +38,7 @@
methods: {
get_items() {
hub.call(
- 'get_saved_items_of_seller', {},
+ 'get_saved_items_of_user', {},
'action:item_save'
)
.then((items) => {
@@ -83,9 +83,9 @@
remove_item_from_saved_items(hub_item_name) {
erpnext.hub.trigger('action:item_save');
- hub.call('remove_item_from_seller_saved_items', {
+ hub.call('remove_item_from_user_saved_items', {
hub_item_name,
- hub_seller: hub.settings.company_email
+ hub_user: frappe.session.user
})
.then(() => {
this.get_items();