Merge pull request #15911 from netchampfaris/marketplace-fixes-3
Hub fixes
This commit is contained in:
commit
bbc1cb274e
@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<div class="hub-page-container">
|
||||
<component :is="current_page"></component>
|
||||
<component :is="current_page.component" :key="current_page.key"></component>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -100,10 +100,16 @@ export default {
|
||||
}
|
||||
|
||||
if (!route) {
|
||||
return NotFound;
|
||||
return {
|
||||
key: 'not-found',
|
||||
component: NotFound
|
||||
};
|
||||
}
|
||||
|
||||
return route_map[route];
|
||||
return {
|
||||
key: curr_route,
|
||||
component: route_map[route]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -113,6 +113,10 @@ export default {
|
||||
content: this.review_content.get_value()
|
||||
});
|
||||
|
||||
if (!hub.is_seller_registered()) {
|
||||
frappe.throw(__('You need to login as a Marketplace User before you can add any reviews.'));
|
||||
}
|
||||
|
||||
hub.call('add_item_review', {
|
||||
hub_item_name: this.hub_item_name,
|
||||
review: JSON.stringify(review)
|
||||
|
@ -1,31 +0,0 @@
|
||||
/**
|
||||
* Simple EventEmitter which uses jQuery's event system
|
||||
*/
|
||||
class EventEmitter {
|
||||
init() {
|
||||
this.jq = jQuery(this);
|
||||
}
|
||||
|
||||
trigger(evt, data) {
|
||||
!this.jq && this.init();
|
||||
this.jq.trigger(evt, data);
|
||||
}
|
||||
|
||||
once(evt, handler) {
|
||||
!this.jq && this.init();
|
||||
this.jq.one(evt, (e, data) => handler(data));
|
||||
}
|
||||
|
||||
on(evt, handler) {
|
||||
!this.jq && this.init();
|
||||
this.jq.bind(evt, (e, data) => handler(data));
|
||||
}
|
||||
|
||||
off(evt, handler) {
|
||||
!this.jq && this.init();
|
||||
this.jq.unbind(evt, (e, data) => handler(data));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
export default EventEmitter;
|
@ -8,14 +8,13 @@ import { ProfileDialog } from './components/profile_dialog';
|
||||
|
||||
// helpers
|
||||
import './hub_call';
|
||||
import EventEmitter from './event_emitter';
|
||||
|
||||
frappe.provide('hub');
|
||||
frappe.provide('erpnext.hub');
|
||||
frappe.provide('frappe.route');
|
||||
|
||||
$.extend(erpnext.hub, EventEmitter.prototype);
|
||||
$.extend(frappe.route, EventEmitter.prototype);
|
||||
frappe.utils.make_event_emitter(frappe.route);
|
||||
frappe.utils.make_event_emitter(erpnext.hub);
|
||||
|
||||
erpnext.hub.Marketplace = class Marketplace {
|
||||
constructor({ parent }) {
|
||||
|
@ -265,6 +265,9 @@ export default {
|
||||
},
|
||||
|
||||
report_item() {
|
||||
if (!hub.is_seller_registered()) {
|
||||
frappe.throw(__('Please login as a Marketplace User to report this item.'));
|
||||
}
|
||||
this.report_item_dialog.show();
|
||||
},
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user