').appendTo(this.page.main.parent());
- this.$footer = $(footerHtml).appendTo(parent);
- }
-
- attachTimeline() {
- let timelineHtml = `
-
-
-
-
-
-
-
`;
-
- let parent = this.$footer.find(".form-comments");
- this.$timeline = $(timelineHtml).appendTo(parent);
-
- this.$timelineList = this.$timeline.find(".timeline-items");
- }
-
- attachReviewArea() {
- this.comment_area = new frappe.ui.ReviewArea({
- parent: this.$footer.find('.timeline-head'),
- mentions: [],
- on_submit: (val) => {
- val.user = frappe.session.user;
- val.username = frappe.session.user_fullname;
- frappe.call({
- method: 'erpnext.hub_node.send_review',
- args: {
- hub_item_code: this.data.hub_item_code,
- review: val
- },
- callback: (r) => {
- this.refresh();
- this.comment_area.reset();
- },
- freeze: true
- });
- }
- });
- }
-
- addReviewToTimeline(data) {
- let username = data.username || data.user || __("Anonymous")
- let imageHtml = data.user_image
- ? `
`
- : `
${frappe.get_abbr(username)}
`
-
- let editHtml = data.own
- ? `
-
- ${'data.delete'}
-
-
-
-
- ${'data.edit'}
-
-
`
- : '';
-
- let ratingHtml = '';
-
- for(var i = 0; i < 5; i++) {
- let starIcon = 'fa-star-o'
- if(i < data.rating) {
- starIcon = 'fa-star';
- }
- ratingHtml += `
`;
- }
-
- $(this.getTimelineItem(data, imageHtml, editHtml, ratingHtml))
- .appendTo(this.$timelineList);
- }
-
- getTimelineItem(data, imageHtml, editHtml, ratingHtml) {
- return `
-
- ${imageHtml}
-
-
-
-
-
${editHtml}
-
-
-
-
-
- ${data.subject}
-
-
-
-
-
- ${ratingHtml}
-
-
-
-
- ${data.content}
-
-
-
-
-
-
`;
- }
-
- prepareFormFields(fields, fieldnames) {
- return fields
- .filter(field => fieldnames.includes(field.fieldname))
- .map(field => {
- let {
- label,
- fieldname,
- fieldtype,
- } = field;
- let read_only = 1;
- return {
- label,
- fieldname,
- fieldtype,
- read_only,
- };
- });
- }
-};
-
-erpnext.hub.ItemPage = class ItemPage extends erpnext.hub.HubDetailsPage {
- constructor(opts) {
- super(opts);
-
- this.show();
- }
-
- setup_defaults() {
- super.setup_defaults();
- this.doctype = 'Item';
- this.image_field_name = 'image';
- }
-
- setup_page_head() {
- super.setup_page_head();
- this.set_primary_action();
- }
-
- setup_side_bar() {
- super.setup_side_bar();
- this.attachFooter();
- this.attachTimeline();
- this.attachReviewArea();
- }
-
- set_primary_action() {
- let item = this.data;
- this.page.set_primary_action(__('Request a Quote'), () => {
- this.show_rfq_modal()
- .then(values => {
- item.item_code = values.item_code;
- delete values.item_code;
-
- const supplier = values;
- return [item, supplier];
- })
- .then(([item, supplier]) => {
- return this.make_rfq(item, supplier, this.page.btn_primary);
- })
- .then(r => {
- console.log(r);
- if (r.message && r.message.rfq) {
- this.page.btn_primary.addClass('disabled').html(`
${__('Quote Requested')}`);
- } else {
- throw r;
- }
- })
- .catch((e) => {
- console.log(e); //eslint-disable-line
- });
- }, 'octicon octicon-plus');
- }
-
- prepare_data(r) {
- super.prepare_data(r);
- this.page.set_title(this.data["item_name"]);
- }
-
- make_rfq(item, supplier, btn) {
- console.log(supplier);
- return new Promise((resolve, reject) => {
- frappe.call({
- method: 'erpnext.hub_node.make_rfq_and_send_opportunity',
- args: { item, supplier },
- callback: resolve,
- btn,
- }).fail(reject);
- });
- }
-
- postRender() {
- this.categoryDialog = new frappe.ui.Dialog({
- title: __('Suggest Category'),
- fields: [
- {
- label: __('Category'),
- fieldname: 'category',
- fieldtype: 'Autocomplete',
- options: this.categories,
- reqd: 1
- }
- ],
- primary_action_label: __("Send"),
- primary_action: () => {
- let values = this.categoryDialog.get_values();
- frappe.call({
- method: 'erpnext.hub_node.update_category',
- args: {
- hub_item_code: this.data.hub_item_code,
- category: values.category
- },
- callback: () => {
- this.categoryDialog.hide();
- this.refresh();
- },
- freeze: true
- }).fail(() => {});
- }
- });
- }
-
- getFormFields() {
- let colOneFieldnames = ['item_name', 'item_code', 'description'];
- let colTwoFieldnames = ['seller', 'company_name', 'country'];
- let colOneFields = this.prepareFormFields(this.meta.fields, colOneFieldnames);
- let colTwoFields = this.prepareFormFields(this.meta.fields, colTwoFieldnames);
-
- let miscFields = [
- {
- label: __('Category'),
- fieldname: 'hub_category',
- fieldtype: 'Data',
- read_only: 1
- },
-
- {
- label: __('Suggest Category?'),
- fieldname: 'set_category',
- fieldtype: 'Button',
- click: () => {
- this.categoryDialog.show();
- }
- },
-
- {
- fieldname: 'cb1',
- fieldtype: 'Column Break'
- }
- ];
- this.formFields = colOneFields.concat(miscFields, colTwoFields);
- }
-
- show_rfq_modal() {
- let item = this.data;
- return new Promise(res => {
- let fields = [
- { label: __('Item Code'), fieldtype: 'Data', fieldname: 'item_code', default: item.item_code },
- { fieldtype: 'Column Break' },
- { label: __('Item Group'), fieldtype: 'Link', fieldname: 'item_group', default: item.item_group },
- { label: __('Supplier Details'), fieldtype: 'Section Break' },
- { label: __('Supplier Name'), fieldtype: 'Data', fieldname: 'supplier_name', default: item.company_name },
- { label: __('Supplier Email'), fieldtype: 'Data', fieldname: 'supplier_email', default: item.seller },
- { fieldtype: 'Column Break' },
- { label: __('Supplier Group'), fieldname: 'supplier_group',
- fieldtype: 'Link', options: 'Supplier Group' }
- ];
- fields = fields.map(f => { f.reqd = 1; return f; });
-
- const d = new frappe.ui.Dialog({
- title: __('Request for Quotation'),
- fields: fields,
- primary_action_label: __('Send'),
- primary_action: (values) => {
- res(values);
- d.hide();
- }
- });
-
- d.show();
- });
- }
-}
-
-erpnext.hub.CompanyPage = class CompanyPage extends erpnext.hub.HubDetailsPage {
- constructor(opts) {
- super(opts);
- this.show();
- }
-
- setup_defaults() {
- super.setup_defaults();
- this.doctype = 'Company';
- this.image_field_name = 'company_logo';
- }
-
- prepare_data(r) {
- super.prepare_data(r);
- this.page.set_title(this.data["company_name"]);
- }
-
- getFormFields() {
- let fieldnames = ['company_name', 'description', 'route', 'country', 'seller', 'site_name'];;
- this.formFields = this.prepareFormFields(this.meta.fields, fieldnames);
- }
-}
diff --git a/erpnext/public/js/hub/hub_listing.js b/erpnext/public/js/hub/hub_listing.js
deleted file mode 100644
index 0ff79708d77..00000000000
--- a/erpnext/public/js/hub/hub_listing.js
+++ /dev/null
@@ -1,718 +0,0 @@
-frappe.provide('erpnext.hub');
-
-erpnext.hub.HubListing = class HubListing extends frappe.views.BaseList {
- setup_defaults() {
- super.setup_defaults();
- this.page_title = __('');
- this.method = 'erpnext.hub_node.get_list';
-
- this.cache = {};
-
- const route = frappe.get_route();
- this.page_name = route[1];
-
- this.menu_items = this.menu_items.concat(this.get_menu_items());
-
- this.imageFieldName = 'image';
-
- this.show_filters = 0;
- }
-
- set_title() {
- const title = this.page_title;
- let iconHtml = `
`;
- let titleHtml = `
${title}`;
- this.page.set_title(iconHtml + titleHtml, '', false, title);
- }
-
- setup_fields() {
- return this.get_meta()
- .then(r => {
- this.meta = r.message.meta || this.meta;
- frappe.model.sync(this.meta);
- this.bootstrap_data(r.message);
-
- this.prepareFormFields();
- });
- }
-
- get_meta() {
- return new Promise(resolve =>
- frappe.call('erpnext.hub_node.get_meta', {doctype: this.doctype}, resolve));
- }
-
- set_breadcrumbs() { }
-
- prepareFormFields() { }
-
- bootstrap_data() { }
-
- get_menu_items() {
- const items = [
- {
- label: __('Hub Settings'),
- action: () => frappe.set_route('Form', 'Hub Settings'),
- standard: true
- },
- {
- label: __('Favourites'),
- action: () => frappe.set_route('Hub', 'Favourites'),
- standard: true
- }
- ];
-
- return items;
- }
-
- setup_side_bar() {
- this.sidebar = new frappe.ui.Sidebar({
- wrapper: this.page.wrapper.find('.layout-side-section'),
- css_class: 'hub-sidebar'
- });
- }
-
- setup_sort_selector() {
- this.sort_selector = new frappe.ui.SortSelector({
- parent: this.filter_area.$filter_list_wrapper,
- doctype: this.doctype,
- args: this.order_by,
- onchange: () => this.refresh(true)
- });
- }
-
- setup_view() {
- if(frappe.route_options){
- const filters = [];
- for (let field in frappe.route_options) {
- var value = frappe.route_options[field];
- this.page.fields_dict[field].set_value(value);
- }
- }
- }
-
- get_args() {
- return {
- doctype: this.doctype,
- start: this.start,
- limit: this.page_length,
- order_by: this.order_by,
- // fields: this.fields,
- filters: this.get_filters_for_args()
- };
- }
-
- update_data(r) {
- const data = r.message;
-
- if (this.start === 0) {
- this.data = data;
- } else {
- this.data = this.data.concat(data);
- }
-
- this.data_dict = {};
- }
-
- freeze(toggle) { }
-
- render() {
- this.data_dict = {};
- this.render_image_view();
-
- this.setup_quick_view();
- this.setup_like();
- }
-
- render_offline_card() {
- let html = `
-
-
- {{ _("Payment Cancelled") }}
-
-
${ __("Your payment is cancelled.") }
-
-
`;
-
- let page = this.page.wrapper.find('.layout-side-section')
- page.append(html);
-
- return;
- }
-
- render_image_view() {
- var html = this.data.map(this.item_html.bind(this)).join("");
-
- if (this.start === 0) {
- // ${this.getHeaderHtml()}
- this.$result.html(`
-
- ${html}
-
- `);
- }
-
- if(this.data.length) {
- this.doc = this.data[0];
- }
-
- this.data.map(this.loadImage.bind(this));
-
- this.data_dict = {};
- this.data.map(d => {
- this.data_dict[d.hub_item_code] = d;
- });
- }
-
- getHeaderHtml(title, image, content) {
- // let company_html =
- return `
-
- `;
- }
-
- renderHeader() {
- return `
`;
- }
-
- get_image_html(encoded_name, src, alt_text) {
- return `
`;
- }
-
- get_image_placeholder(title) {
- return `
${ frappe.get_abbr(title) }`;
- }
-
- loadImage(item) {
- item._name = encodeURI(item.name);
- const encoded_name = item._name;
- const title = strip_html(item[this.meta.title_field || 'name']);
-
- let placeholder = this.get_image_placeholder(title);
- let $container = this.$result.find(`.image-field[data-name="${encoded_name}"]`);
-
- if(!item[this.imageFieldName]) {
- $container.prepend(placeholder);
- $container.addClass('no-image');
- }
-
- frappe.load_image(item[this.imageFieldName],
- (imageObj) => {
- $container.prepend(imageObj)
- },
- () => {
- $container.prepend(placeholder);
- $container.addClass('no-image');
- },
- (imageObj) => {
- imageObj.title = encoded_name;
- imageObj.alt = title;
- }
- )
- }
-
- setup_quick_view() {
- if(this.quick_view) return;
-
- this.quick_view = new frappe.ui.Dialog({
- title: 'Quick View',
- fields: this.formFields
- });
- this.quick_view.set_primary_action(__('Request a Quote'), () => {
- this.show_rfq_modal()
- .then(values => {
- item.item_code = values.item_code;
- delete values.item_code;
-
- const supplier = values;
- return [item, supplier];
- })
- .then(([item, supplier]) => {
- return this.make_rfq(item, supplier, this.page.btn_primary);
- })
- .then(r => {
- console.log(r);
- if (r.message && r.message.rfq) {
- this.page.btn_primary.addClass('disabled').html(`
${__('Quote Requested')}`);
- } else {
- throw r;
- }
- })
- .catch((e) => {
- console.log(e); //eslint-disable-line
- });
- }, 'octicon octicon-plus');
-
- this.$result.on('click', '.btn.zoom-view', (e) => {
- e.preventDefault();
- e.stopPropagation();
- var name = $(e.target).attr('data-name');
- name = decodeURIComponent(name);
-
- this.quick_view.set_title(name);
- let values = this.data_dict[name];
- this.quick_view.set_values(values);
-
- let fields = [];
-
- this.quick_view.show();
-
- return false;
- });
- }
-
- setup_like() {
- if(this.setup_like_done) return;
- this.setup_like_done = 1;
- this.$result.on('click', '.btn.like-button', (e) => {
- if($(e.target).hasClass('changing')) return;
- $(e.target).addClass('changing');
-
- e.preventDefault();
- e.stopPropagation();
-
- var name = $(e.target).attr('data-name');
- name = decodeURIComponent(name);
- let values = this.data_dict[name];
-
- let heart = $(e.target);
- if(heart.hasClass('like-button')) {
- heart = $(e.target).find('.octicon');
- }
-
- let remove = 1;
-
- if(heart.hasClass('liked')) {
- // unlike
- heart.removeClass('liked');
- } else {
- // like
- remove = 0;
- heart.addClass('liked');
- }
-
- frappe.call({
- method: 'erpnext.hub_node.update_wishlist_item',
- args: {
- item_name: values.hub_item_code,
- remove: remove
- },
- callback: (r) => {
- let message = __("Added to Favourites");
- if(remove) {
- message = __("Removed from Favourites");
- }
- frappe.show_alert(message);
- },
- freeze: true
- });
-
- $(e.target).removeClass('changing');
- return false;
- });
- }
-}
-
-erpnext.hub.ItemListing = class ItemListing extends erpnext.hub.HubListing {
- constructor(opts) {
- super(opts);
- this.show();
- }
-
- setup_defaults() {
- super.setup_defaults();
- this.doctype = 'Hub Item';
- this.page_title = __('Marketplace');
- this.fields = ['name', 'hub_item_code', 'image', 'item_name', 'item_code', 'company_name', 'description', 'country'];
- this.filters = [];
- }
-
- render() {
- this.data_dict = {};
- this.render_image_view();
-
- this.setup_quick_view();
- this.setup_like();
- }
-
- bootstrap_data(response) {
- let companies = response.companies.map(d => d.name);
- this.custom_filter_configs = [
- {
- fieldtype: 'Autocomplete',
- label: __('Select Company'),
- condition: 'like',
- fieldname: 'company_name',
- options: companies
- },
- {
- fieldtype: 'Link',
- label: __('Select Country'),
- options: 'Country',
- condition: 'like',
- fieldname: 'country'
- }
- ];
- }
-
- prepareFormFields() {
- let fieldnames = ['item_name', 'description', 'company_name', 'country'];
- this.formFields = this.meta.fields
- .filter(field => fieldnames.includes(field.fieldname))
- .map(field => {
- let {
- label,
- fieldname,
- fieldtype,
- } = field;
- let read_only = 1;
- return {
- label,
- fieldname,
- fieldtype,
- read_only,
- };
- });
-
- this.formFields.unshift({
- label: 'image',
- fieldname: 'image',
- fieldtype: 'Attach Image'
- });
- }
-
- setup_side_bar() {
- super.setup_side_bar();
-
- let $pitch = $(`
-
Sell on HubMarket
-
Over 2000 products listed. Register your company to start selling.
-
`);
-
- this.sidebar.$sidebar.append($pitch);
-
- this.category_tree = new frappe.ui.Tree({
- parent: this.sidebar.$sidebar,
- label: 'All Categories',
- expandable: true,
-
- args: {parent: this.current_category},
- method: 'erpnext.hub_node.get_categories',
- on_click: (node) => {
- this.update_category(node.label);
- }
- });
-
- this.sidebar.add_item({
- label: __('Companies'),
- on_click: () => frappe.set_route('Hub', 'Company')
- }, undefined, true);
-
- this.sidebar.add_item({
- label: this.hub_settings.company,
- on_click: () => frappe.set_route('Form', 'Company', this.hub_settings.company)
- }, __("Account"));
-
- this.sidebar.add_item({
- label: __("Favourites"),
- on_click: () => frappe.set_route('Hub', 'Favourites')
- }, __("Account"));
-
- this.sidebar.add_item({
- label: __("Settings"),
- on_click: () => frappe.set_route('Form', 'Hub Settings')
- }, __("Account"));
- }
-
- update_category(label) {
- this.current_category = (label=='All Categories') ? undefined : label;
- this.refresh();
- }
-
- get_filters_for_args() {
- if(!this.filter_area) return;
- let filters = {};
- this.filter_area.get().forEach(f => {
- let field = f[1] !== 'name' ? f[1] : 'item_name';
- filters[field] = [f[2], f[3]];
- });
- if(this.current_category) {
- filters['hub_category'] = this.current_category;
- }
- return filters;
- }
-
- update_data(r) {
- super.update_data(r);
-
- this.data_dict = {};
- this.data.map(d => {
- this.data_dict[d.hub_item_code] = d;
- });
- }
-
- item_html(item) {
- item._name = encodeURI(item.name);
- const encoded_name = item._name;
- const title = strip_html(item[this.meta.title_field || 'name']);
- const _class = !item[this.imageFieldName] ? 'no-image' : '';
- const route = `#Hub/Item/${item.hub_item_code}`;
- const company_name = item['company_name'];
-
- const reviewLength = (item.reviews || []).length;
- const ratingAverage = reviewLength
- ? item.reviews
- .map(r => r.rating)
- .reduce((a, b) => a + b, 0)/reviewLength
- : -1;
-
- let ratingHtml = ``;
-
- for(var i = 0; i < 5; i++) {
- let starClass = 'fa-star';
- if(i >= ratingAverage) starClass = 'fa-star-o';
- ratingHtml += `
`;
- }
-
- let item_html = `
-
- `;
-
- return item_html;
- }
-
-};
-
-erpnext.hub.Favourites = class Favourites extends erpnext.hub.ItemListing {
- constructor(opts) {
- super(opts);
- this.show();
- }
-
- setup_defaults() {
- super.setup_defaults();
- this.doctype = 'Hub Item';
- this.page_title = __('Favourites');
- this.fields = ['name', 'hub_item_code', 'image', 'item_name', 'item_code', 'company_name', 'description', 'country'];
- this.filters = [];
- this.method = 'erpnext.hub_node.get_item_favourites';
- }
-
- setup_filter_area() { }
-
- setup_sort_selector() { }
-
- // setupHe
-
- getHeaderHtml() {
- return '';
- }
-
- get_args() {
- return {
- start: this.start,
- limit: this.page_length,
- order_by: this.order_by,
- fields: this.fields
- };
- }
-
- bootstrap_data(response) { }
-
- prepareFormFields() { }
-
- setup_side_bar() {
- this.sidebar = new frappe.ui.Sidebar({
- wrapper: this.page.wrapper.find('.layout-side-section'),
- css_class: 'hub-sidebar'
- });
-
- this.sidebar.add_item({
- label: __('Back to Products'),
- on_click: () => frappe.set_route('Hub', 'Item')
- });
- }
-
- update_category(label) {
- this.current_category = (label=='All Categories') ? undefined : label;
- this.refresh();
- }
-
- get_filters_for_args() {
- if(!this.filter_area) return;
- let filters = {};
- this.filter_area.get().forEach(f => {
- let field = f[1] !== 'name' ? f[1] : 'item_name';
- filters[field] = [f[2], f[3]];
- });
- if(this.current_category) {
- filters['hub_category'] = this.current_category;
- }
- return filters;
- }
-
- update_data(r) {
- super.update_data(r);
-
- this.data_dict = {};
- this.data.map(d => {
- this.data_dict[d.hub_item_code] = d;
- });
- }
-};
-
-erpnext.hub.CompanyListing = class CompanyListing extends erpnext.hub.HubListing {
- constructor(opts) {
- super(opts);
- this.show();
- }
-
- render() {
- this.data_dict = {};
- this.render_image_view();
- }
-
- setup_defaults() {
- super.setup_defaults();
- this.doctype = 'Hub Company';
- this.page_title = __('Companies');
- this.fields = ['company_logo', 'name', 'site_name', 'seller_city', 'seller_description', 'seller', 'country', 'company_name'];
- this.filters = [];
- this.custom_filter_configs = [
- {
- fieldtype: 'Link',
- label: 'Country',
- options: 'Country',
- condition: 'like',
- fieldname: 'country'
- }
- ];
- this.imageFieldName = 'company_logo';
- }
-
- setup_side_bar() {
- this.sidebar = new frappe.ui.Sidebar({
- wrapper: this.page.wrapper.find('.layout-side-section'),
- css_class: 'hub-sidebar'
- });
-
- this.sidebar.add_item({
- label: __('Back to Products'),
- on_click: () => frappe.set_route('Hub', 'Item')
- });
- }
-
- get_filters_for_args() {
- let filters = {};
- this.filter_area.get().forEach(f => {
- let field = f[1] !== 'name' ? f[1] : 'company_name';
- filters[field] = [f[2], f[3]];
- });
- return filters;
- }
-
- item_html(company) {
- company._name = encodeURI(company.company_name);
- const encoded_name = company._name;
- const title = strip_html(company.company_name);
- const _class = !company[this.imageFieldName] ? 'no-image' : '';
- const company_name = company['company_name'];
- const route = `#Hub/Company/${company_name}`;
-
- let image_html = company.company_logo ?
- `
` :
- `
${frappe.get_abbr(company.company_name)}
`;
-
- let item_html = `
-
- `;
-
- return item_html;
- }
-
-};
\ No newline at end of file
diff --git a/erpnext/public/js/hub/marketplace.js b/erpnext/public/js/hub/marketplace.js
new file mode 100644
index 00000000000..cdf3d2332d0
--- /dev/null
+++ b/erpnext/public/js/hub/marketplace.js
@@ -0,0 +1,115 @@
+import Vue from 'vue/dist/vue.js';
+import './vue-plugins';
+
+// components
+import PageContainer from './PageContainer.vue';
+import Sidebar from './Sidebar.vue';
+import { ProfileDialog } from './components/profile_dialog';
+
+// helpers
+import './hub_call';
+import EventEmitter from './event_emitter';
+
+frappe.provide('hub');
+frappe.provide('erpnext.hub');
+
+$.extend(erpnext.hub, EventEmitter.prototype);
+
+erpnext.hub.Marketplace = class Marketplace {
+ constructor({ parent }) {
+ this.$parent = $(parent);
+ this.page = parent.page;
+
+ frappe.db.get_doc('Hub Settings')
+ .then(doc => {
+ hub.settings = doc;
+ const is_registered = hub.settings.registered;
+ const is_registered_seller = hub.settings.company_email === frappe.session.user;
+ this.setup_header();
+ this.make_sidebar();
+ this.make_body();
+ this.setup_events();
+ this.refresh();
+ if (!is_registered && !is_registered_seller && frappe.user_roles.includes('System Manager')) {
+ this.page.set_primary_action('Become a Seller', this.show_register_dialog.bind(this))
+ }
+ });
+ }
+
+ setup_header() {
+ this.page.set_title(__('Marketplace'));
+ }
+
+ setup_events() {
+ this.$parent.on('click', '[data-route]', (e) => {
+ const $target = $(e.currentTarget);
+ const route = $target.data().route;
+ frappe.set_route(route);
+ });
+
+ // generic action handler
+ this.$parent.on('click', '[data-action]', e => {
+ const $target = $(e.currentTarget);
+ const action = $target.data().action;
+
+ if (action && this[action]) {
+ this[action].apply(this, $target);
+ }
+ })
+ }
+
+ make_sidebar() {
+ this.$sidebar = this.$parent.find('.layout-side-section').addClass('hidden-xs');
+
+ new Vue({
+ el: $('
').appendTo(this.$sidebar)[0],
+ render: h => h(Sidebar)
+ });
+ }
+
+ make_body() {
+ this.$body = this.$parent.find('.layout-main-section');
+ this.$page_container = $('
').appendTo(this.$body);
+
+ new Vue({
+ el: '.hub-page-container',
+ render: h => h(PageContainer)
+ });
+
+ erpnext.hub.on('seller-registered', () => {
+ this.page.clear_primary_action()
+ frappe.db.get_doc('Hub Settings').then((doc)=> {
+ hub.settings = doc;
+ });
+ });
+ }
+
+ refresh() {
+
+ }
+
+ show_register_dialog() {
+ this.register_dialog = ProfileDialog(
+ __('Become a Seller'),
+ {
+ label: __('Register'),
+ on_submit: this.register_seller.bind(this)
+ }
+ );
+
+ this.register_dialog.show();
+ }
+
+ register_seller(form_values) {
+ frappe.call({
+ method: 'erpnext.hub_node.doctype.hub_settings.hub_settings.register_seller',
+ args: form_values
+ }).then(() => {
+ this.register_dialog.hide();
+ frappe.set_route('marketplace', 'publish');
+
+ erpnext.hub.trigger('seller-registered');
+ });
+ }
+
+}
diff --git a/erpnext/public/js/hub/pages/Buying.vue b/erpnext/public/js/hub/pages/Buying.vue
new file mode 100644
index 00000000000..ddb4b11db90
--- /dev/null
+++ b/erpnext/public/js/hub/pages/Buying.vue
@@ -0,0 +1,53 @@
+
+
+
+ {{ __('Buying') }}
+
+
+
+
+
+ {{item.recent_message.sender}}:
+ {{item.recent_message.content | striphtml}}
+
+
+
+
+
+
+
diff --git a/erpnext/public/js/hub/pages/Category.vue b/erpnext/public/js/hub/pages/Category.vue
new file mode 100644
index 00000000000..3a0e6bfab83
--- /dev/null
+++ b/erpnext/public/js/hub/pages/Category.vue
@@ -0,0 +1,59 @@
+
+
+
{{ page_title }}
+
+
+
+
+
+
+
+
+
diff --git a/erpnext/public/js/hub/pages/Home.vue b/erpnext/public/js/hub/pages/Home.vue
new file mode 100644
index 00000000000..4f9796d2976
--- /dev/null
+++ b/erpnext/public/js/hub/pages/Home.vue
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+ {{ section.title }}
+ {{ 'See All' }}
+
+
+
+
+
+
+
+
+
diff --git a/erpnext/public/js/hub/pages/Item.vue b/erpnext/public/js/hub/pages/Item.vue
new file mode 100644
index 00000000000..3305b1da4ca
--- /dev/null
+++ b/erpnext/public/js/hub/pages/Item.vue
@@ -0,0 +1,280 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/erpnext/public/js/hub/pages/Messages.vue b/erpnext/public/js/hub/pages/Messages.vue
new file mode 100644
index 00000000000..1930bcb22ad
--- /dev/null
+++ b/erpnext/public/js/hub/pages/Messages.vue
@@ -0,0 +1,105 @@
+
+
+
+
+
+
{{ item_details.item_name }}
+ {{ item_details.company }}
+
+
+
+
+
diff --git a/erpnext/public/js/hub/pages/NotFound.vue b/erpnext/public/js/hub/pages/NotFound.vue
new file mode 100644
index 00000000000..246d31bc681
--- /dev/null
+++ b/erpnext/public/js/hub/pages/NotFound.vue
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/erpnext/public/js/hub/pages/Profile.vue b/erpnext/public/js/hub/pages/Profile.vue
new file mode 100644
index 00000000000..a0bc6cba78d
--- /dev/null
+++ b/erpnext/public/js/hub/pages/Profile.vue
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/erpnext/public/js/hub/pages/Publish.vue b/erpnext/public/js/hub/pages/Publish.vue
new file mode 100644
index 00000000000..b05f12adb6e
--- /dev/null
+++ b/erpnext/public/js/hub/pages/Publish.vue
@@ -0,0 +1,217 @@
+
+
+
+
+
+
{{ page_title }}
+
+
+
+
+
+
+
+
{{ valid_items_instruction }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/erpnext/public/js/hub/pages/PublishedItems.vue b/erpnext/public/js/hub/pages/PublishedItems.vue
new file mode 100644
index 00000000000..114259b93c0
--- /dev/null
+++ b/erpnext/public/js/hub/pages/PublishedItems.vue
@@ -0,0 +1,81 @@
+
+
+
+
+
{{ page_title }}
+
+ {{ published_items_message }}
+
+
+
+
+
+
+
+
+
+
diff --git a/erpnext/public/js/hub/pages/SavedItems.vue b/erpnext/public/js/hub/pages/SavedItems.vue
new file mode 100644
index 00000000000..e5d21cdd3c3
--- /dev/null
+++ b/erpnext/public/js/hub/pages/SavedItems.vue
@@ -0,0 +1,111 @@
+
+
+
{{ page_title }}
+
+
+
+
+
+
+
+
+
diff --git a/erpnext/public/js/hub/pages/Search.vue b/erpnext/public/js/hub/pages/Search.vue
new file mode 100644
index 00000000000..5118a814e07
--- /dev/null
+++ b/erpnext/public/js/hub/pages/Search.vue
@@ -0,0 +1,70 @@
+
+
+
+
+
+
{{ page_title }}
+
+
+
+
+
+
+
+
+
diff --git a/erpnext/public/js/hub/pages/Seller.vue b/erpnext/public/js/hub/pages/Seller.vue
new file mode 100644
index 00000000000..c80865bfbda
--- /dev/null
+++ b/erpnext/public/js/hub/pages/Seller.vue
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
{{ item_container_heading }}
+
+
+
+
+
+
+
+
diff --git a/erpnext/public/js/hub/pages/Selling.vue b/erpnext/public/js/hub/pages/Selling.vue
new file mode 100644
index 00000000000..9c8ede66642
--- /dev/null
+++ b/erpnext/public/js/hub/pages/Selling.vue
@@ -0,0 +1,66 @@
+
+
+
+ {{ __('Selling') }}
+
+
+
+
+
+ {{ __('{0} conversations', [item.received_messages.length]) }}
+
+
+
+
+
+
+ {{ message.buyer }}
+
+
+ {{ message.sender }}: {{ message.content }}
+
+
+
+
+
+
+
+
+
diff --git a/erpnext/public/js/hub/vue-plugins.js b/erpnext/public/js/hub/vue-plugins.js
new file mode 100644
index 00000000000..e18af0c428e
--- /dev/null
+++ b/erpnext/public/js/hub/vue-plugins.js
@@ -0,0 +1,66 @@
+import Vue from 'vue/dist/vue.js';
+
+// Global components
+import ItemCardsContainer from './components/ItemCardsContainer.vue';
+import SectionHeader from './components/SectionHeader.vue';
+import SearchInput from './components/SearchInput.vue';
+import DetailView from './components/DetailView.vue';
+import DetailHeaderItem from './components/DetailHeaderItem.vue';
+import EmptyState from './components/EmptyState.vue';
+
+Vue.prototype.__ = window.__;
+Vue.prototype.frappe = window.frappe;
+
+Vue.component('item-cards-container', ItemCardsContainer);
+Vue.component('section-header', SectionHeader);
+Vue.component('search-input', SearchInput);
+Vue.component('detail-view', DetailView);
+Vue.component('detail-header-item', DetailHeaderItem);
+Vue.component('empty-state', EmptyState);
+
+Vue.directive('route', {
+ bind(el, binding) {
+ const route = binding.value;
+ if (!route) return;
+ el.classList.add('cursor-pointer');
+ el.dataset.route = route;
+ el.addEventListener('click', () => frappe.set_route(route));
+ },
+ unbind(el) {
+ el.classList.remove('cursor-pointer');
+ }
+});
+
+const handleImage = (el, src) => {
+ let img = new Image();
+ // add loading class
+ el.src = '';
+ el.classList.add('img-loading');
+
+ img.onload = () => {
+ // image loaded, remove loading class
+ el.classList.remove('img-loading');
+ // set src
+ el.src = src;
+ }
+ img.onerror = () => {
+ el.classList.remove('img-loading');
+ el.classList.add('no-image');
+ el.src = null;
+ }
+ img.src = src;
+}
+
+Vue.directive('img-src', {
+ bind(el, binding) {
+ handleImage(el, binding.value);
+ },
+ update(el, binding) {
+ if (binding.value === binding.oldValue) return;
+ handleImage(el, binding.value);
+ }
+});
+
+Vue.filter('striphtml', function (text) {
+ return strip_html(text);
+});
\ No newline at end of file
diff --git a/erpnext/public/less/hub.less b/erpnext/public/less/hub.less
index bdca28f1e74..d40926b7adb 100644
--- a/erpnext/public/less/hub.less
+++ b/erpnext/public/less/hub.less
@@ -1,171 +1,352 @@
@import "../../../../frappe/frappe/public/less/variables.less";
-body[data-route^="Hub/"] {
- .hub-icon {
- width: 40px;
- height: 40px;
+body[data-route^="marketplace/"] {
+ .layout-side-section {
+ padding-top: 25px;
+ padding-left: 5px;
+ padding-right: 25px;
}
- .hub-page-title {
- margin-left: 10px;
+ [data-route], [data-action] {
+ cursor: pointer;
}
- .img-wrapper {
- border: 1px solid #d1d8dd;
- border-radius: 3px;
- padding: 12px;
- overflow: hidden;
- text-align: center;
- white-space: nowrap;
+ .layout-main-section {
+ border: none;
+ font-size: @text-medium;
+ padding-top: 25px;
- .helper {
- height: 100%;
- display: inline-block;
- vertical-align: middle;
+ @media (max-width: @screen-xs) {
+ padding-left: 20px;
+ padding-right: 20px;
}
}
- .tree {
- margin: 10px 0px;
- padding: 0px;
- height: 100%;
+ input, textarea {
+ font-size: @text-medium;
+ }
+
+ .progress-bar {
+ background-color: #89da28;
+ }
+
+ .subpage-title.flex {
+ align-items: flex-start;
+ justify-content: space-between;
+ }
+
+ .hub-card {
+ margin-bottom: 25px;
position: relative;
- }
-
- .tree.with-skeleton.opened::before {
- left: 9px;
- top: 14px;
- height: calc(~"100% - 32px");
- }
-
- .list-header-icon {
- width: 72px;
- border-radius: 4px;
- flex-shrink: 0;
- margin: 10px;
- padding: 1px;
border: 1px solid @border-color;
- height: 72px;
+ border-radius: 4px;
+ overflow: hidden;
+
+ &:hover .hub-card-overlay {
+ display: block;
+ }
+ }
+
+ .hub-card.is-local {
+ &.active {
+ .hub-card-header {
+ background-color: #f4ffe5;
+ }
+
+ .octicon-check {
+ display: inline;
+ }
+ }
+
+ .octicon-check {
+ display: none;
+ position: absolute;
+ font-size: 20px;
+ right: 15px;
+ top: 50%;
+ transform: translateY(-50%);
+ }
+ }
+
+ .hub-card-header {
+ position: relative;
+ padding: 12px 15px;
+ height: 60px;
+ border-bottom: 1px solid @border-color;
+ }
+
+ .hub-card-body {
+ position: relative;
+ height: 200px;
+ }
+
+ .hub-card-overlay {
+ display: none;
+ position: absolute;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.05);
+ }
+
+ .hub-card-overlay-body {
+ position: relative;
+ height: 100%;
+ }
+
+ .hub-card-overlay-button {
+ position: absolute;
+ right: 15px;
+ bottom: 15px;
+ }
+
+ .hub-card-image {
+ position: relative;
+ width: 100%;
+ height: 100%;
+ object-fit: contain;
+ }
+
+ .hub-search-container {
+ margin-bottom: 20px;
+
+ input {
+ height: 32px;
+ }
+ }
+
+ .hub-sidebar {
+ padding-top: 25px;
+ padding-right: 15px;
+ }
+
+ .hub-sidebar-group {
+ margin-bottom: 10px;
+ }
+
+ .hub-sidebar-item {
+ padding: 5px 8px;
+ margin-bottom: 3px;
+ border-radius: 4px;
+ border: 1px solid transparent;
+
+ &.active, &:hover:not(.is-title) {
+ border-color: @border-color;
+ }
+ }
+
+ .hub-item-image {
+ border: 1px solid @border-color;
+ border-radius: 4px;
+ overflow: hidden;
+ height: 200px;
+ width: 200px;
display: flex;
align-items: center;
- justify-content: center;
+ }
- img {
- border-radius: 4px;
+ .hub-item-skeleton-image {
+ border-radius: 4px;
+ background-color: @light-bg;
+ overflow: hidden;
+ height: 200px;
+ width: 200px;
+ }
+
+ .hub-skeleton {
+ background-color: @light-bg;
+ color: @light-bg;
+ max-width: 500px;
+ }
+
+ .hub-item-seller img {
+ width: 50px;
+ height: 50px;
+ border-radius: 4px;
+ border: 1px solid @border-color;
+ }
+
+ .register-title {
+ font-size: @text-regular;
+ }
+
+ .register-form {
+ border: 1px solid @border-color;
+ border-radius: 4px;
+ padding: 15px 25px;
+ }
+
+ .publish-area.filled {
+ .empty-items-container {
+ display: none;
}
}
- .star-icon.fa-star {
- color: @indicator-orange;
+ .publish-area.empty {
+ .hub-items-container {
+ display: none;
+ }
}
- .octicon-heart.liked {
- color: @indicator-red;
+ .publish-area-head {
+ display: flex;
+ justify-content: space-between;
+ margin-bottom: 20px;
}
- .margin-vertical-10 {
- margin: 10px 0px;
+ .hub-list-item {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ border: 1px solid @border-color;
+ margin-bottom: -1px;
+ overflow: hidden;
}
- .margin-vertical-15 {
- margin: 15px 0px;
+ .hub-list-item:first-child {
+ border-top-left-radius: 4px;
+ border-top-right-radius: 4px;
+ }
+ .hub-list-item:last-child {
+ border-bottom-left-radius: 4px;
+ border-bottom-right-radius: 4px;
}
- .frappe-list .result {
- min-height: 100px;
+ .hub-list-left {
+ display: flex;
+ align-items: center;
+ max-width: 90%;
}
- .frappe-control[data-fieldtype="Attach Image"] {
- width: 140px;
- height: 180px;
+ .hub-list-right {
+ padding-right: 15px;
+ }
+
+ .hub-list-image {
+ position: relative;
+ width: 58px;
+ height: 58px;
+ border-right: 1px solid @border-color;
+
+ &::after {
+ font-size: 12px;
+ }
+ }
+
+ .hub-list-body {
+ padding: 12px 15px;
+ }
+
+ .hub-list-title {
+ font-weight: bold;
+ }
+
+ .hub-list-subtitle {
+ color: @text-muted;
+ }
+
+ .selling-item-message-card {
+ max-width: 500px;
+ margin-bottom: 15px;
+ border-radius: 3px;
+ border: 1px solid @border-color;
+ .selling-item-detail {
+ overflow: auto;
+ .item-image {
+ float: left;
+ height: 80px;
+ width: 80px;
+ object-fit: contain;
+ margin: 5px;
+ }
+ .item-name {
+ margin-left: 10px;
+ }
+ }
+ .received-message-container {
+ clear: left;
+ background-color: @light-bg;
+ .received-message {
+ border-top: 1px solid @border-color;
+ padding: 10px;
+ }
+ .frappe-timestamp {
+ float: right;
+ }
+ }
+ }
+
+ .form-container {
+ .frappe-control {
+ max-width: 100% !important;
+ }
+ }
+
+ .form-message {
+ padding-top: 0;
+ padding-bottom: 0;
+ border-bottom: none;
+ }
+
+ .hub-items-container {
+ .hub-items-header {
+ justify-content: space-between;
+ align-items: baseline;
+ }
+ }
+
+ .hub-item-container {
+ overflow: hidden;
+ }
+
+ .hub-item-review-container {
+ margin-top: calc(30vh);
+ }
+
+ .hub-item-dropdown {
margin-top: 20px;
}
- .frappe-control[data-fieldtype="Attach Image"] .form-group {
- display: none;
- }
+ /* messages page */
- .frappe-control[data-fieldtype="Attach Image"] .clearfix {
- display: none;
- }
-
- .missing-image {
- display: block;
- position: relative;
- border-radius: 4px;
- border: 1px solid #d1d8dd;
- border-radius: 6px;
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- }
- .missing-image .octicon {
- position: relative;
- top: 50%;
- transform: translate(0px, -50%);
- -webkit-transform: translate(0px, -50%);
- }
- .attach-image-display {
- display: block;
- position: relative;
- border-radius: 4px;
- }
- .img-container {
- height: 100%;
- width: 100%;
- padding: 2px;
+ .message-list-item {
display: flex;
align-items: center;
- justify-content: center;
- position: relative;
- border: 1px solid #d1d8dd;
- border-radius: 6px;
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
- }
- .img-overlay {
- display: flex;
- align-items: center;
- justify-content: center;
- position: absolute;
- width: 100%;
- height: 100%;
- color: #777777;
- background-color: rgba(255, 255, 255, 0.7);
- opacity: 0;
- }
- .img-overlay:hover {
- opacity: 1;
- cursor: pointer;
- }
-}
+ padding: 8px 12px;
-.image-view-container {
- .image-view-body {
- &:hover .like-button {
- opacity: 0.7;
+ &:not(.active) {
+ filter: grayscale(1);
+ color: @text-muted;
+ }
+
+ &:hover {
+ background-color: @light-bg;
+ }
+
+ .list-item-left {
+ width: 30px;
+ border-radius: 4px;
+ overflow: hidden;
+ margin-right: 15px;
+ }
+
+ .list-item-body {
+ font-weight: bold;
+ padding-bottom: 1px;
}
}
- .like-button {
- bottom: 10px !important;
- left: 10px !important;
- width: 36px;
- height: 36px;
- opacity: 0;
- font-size: 16px;
- color: @text-color;
- position: absolute;
-
- // show zoom button on mobile devices
- @media (max-width: @screen-xs) {
- opacity: 0.5
- }
+ .message-container {
+ display: flex;
+ flex-direction: column;
+ border: 1px solid @border-color;
+ border-radius: 3px;
+ height: calc(100vh - 300px);
+ justify-content: space-between;
+ padding: 15px;
}
- .image-view-body:hover .like-button {
- opacity: 0.7;
+ .message-list {
+ overflow: scroll;
}
}
-
-.rating-area .star-icon {
- cursor: pointer;
- font-size: 15px;
-}
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 779f1c6d63d..9161f2d149b 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -4121,4 +4121,4 @@
"track_changes": 1,
"track_seen": 0,
"track_views": 0
-}
\ No newline at end of file
+}
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 2cf33b9efc6..c79d76d6e27 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -76,8 +76,8 @@ class Item(WebsiteGenerator):
if not self.description:
self.description = self.item_name
- if self.is_sales_item and not self.get('is_item_from_hub'):
- self.publish_in_hub = 1
+ # if self.is_sales_item and not self.get('is_item_from_hub'):
+ # self.publish_in_hub = 1
def after_insert(self):
'''set opening stock and item price'''
- Products by Blah blah
-