Browse Source

Apr 18 [FIX] : Bug Fixed 'membership_in_pos'

pull/278/merge
AjmalCybro 1 year ago
parent
commit
fe97524d77
  1. 2
      membership_in_pos/__manifest__.py
  2. 13
      membership_in_pos/models/membership_card.py
  3. 1
      membership_in_pos/static/src/js/AbstractAwaitablePopup.js
  4. 3
      membership_in_pos/static/src/js/ProductScreen.js
  5. 4
      membership_in_pos/views/membership_card_views.xml

2
membership_in_pos/__manifest__.py

@ -31,7 +31,7 @@
'company': 'Cybrosys Techno Solutions', 'company': 'Cybrosys Techno Solutions',
'maintainer': 'Cybrosys Techno Solutions', 'maintainer': 'Cybrosys Techno Solutions',
'website': 'https://www.cybrosys.com', 'website': 'https://www.cybrosys.com',
'depends': ['pos_sale', 'sale', 'pos_loyalty', 'pos_discount'], 'depends': ['pos_sale', 'sale', 'pos_loyalty', 'pos_discount','point_of_sale'],
'data': { 'data': {
'security/ir.model.access.csv', 'security/ir.model.access.csv',
'views/res_config_settings_views.xml', 'views/res_config_settings_views.xml',

13
membership_in_pos/models/membership_card.py

@ -23,6 +23,8 @@
from uuid import uuid4 from uuid import uuid4
from odoo import api, fields, models, _ from odoo import api, fields, models, _
from odoo import exceptions from odoo import exceptions
from datetime import datetime, timedelta
class MembershipCard(models.Model): class MembershipCard(models.Model):
@ -36,7 +38,8 @@ class MembershipCard(models.Model):
required=True, help='Membership id') required=True, help='Membership id')
customer_id = fields.Many2one('res.partner', string="Customer", customer_id = fields.Many2one('res.partner', string="Customer",
help='The customer') help='The customer')
issue_date = fields.Date(string="Issue Date", help='Issue date') issue_date = fields.Date(string="Issue Date", help='Issue date',
default=fields.Date.today())
validity = fields.Float(string='Validity(days)', validity = fields.Float(string='Validity(days)',
compute='_compute_validity', compute='_compute_validity',
help='Validity of membership card') help='Validity of membership card')
@ -74,9 +77,11 @@ class MembershipCard(models.Model):
def _compute_validity(self): def _compute_validity(self):
"""Computes the validity""" """Computes the validity"""
for rec in self: fmt = '%Y-%m-%d'
date = rec.expiry_date - rec.issue_date date_from = datetime.strptime(str(self.issue_date), fmt)
rec.validity = date.days date_to = datetime.strptime(str(self.expiry_date), fmt)
duration = str((date_to - date_from).days)
self.validity = duration
def membership_card_check(self, customer_input): def membership_card_check(self, customer_input):
"""Checks the validity of the membership card""" """Checks the validity of the membership card"""

1
membership_in_pos/static/src/js/AbstractAwaitablePopup.js

@ -63,6 +63,7 @@ odoo.define('membership_in_pos.MembershipPopup', function (require) {
// We add the price as manually set to avoid re computation when changing customer. // We add the price as manually set to avoid re computation when changing customer.
let discount = - parseFloat(this.env.pos.card.discount) / 100.0 * baseToDiscount; let discount = - parseFloat(this.env.pos.card.discount) / 100.0 * baseToDiscount;
if (discount < 0) { if (discount < 0) {
console.log("fffffffffffff")
order.add_product(product, { order.add_product(product, {
price: discount, price: discount,
lst_price: discount, lst_price: discount,

3
membership_in_pos/static/src/js/ProductScreen.js

@ -34,6 +34,9 @@ odoo.define('membership_in_pos.customer', function (require) {
}); });
} }
} }
} }
Registries.Component.extend(ProductScreen, PosCustomer); Registries.Component.extend(ProductScreen, PosCustomer);
return ProductScreen; return ProductScreen;

4
membership_in_pos/views/membership_card_views.xml

@ -78,8 +78,8 @@
<menuitem id="pos_membership_menu_root" <menuitem id="pos_membership_menu_root"
name="Customer Membership" name="Customer Membership"
parent="point_of_sale.menu_point_root" parent="point_of_sale.menu_point_root"
sequence="3"> sequence="3"/>
</menuitem> <!-- </menuitem>-->
<!--Membership card menu --> <!--Membership card menu -->
<menuitem id="pos_membership_menu_membership_card" <menuitem id="pos_membership_menu_membership_card"

Loading…
Cancel
Save