From e83d797120cc0979aa988d2958d9190ffb69ff0e Mon Sep 17 00:00:00 2001 From: Vildan Safin Date: Fri, 28 Feb 2020 16:44:00 +0500 Subject: [PATCH] :bomb: Added Manage Apps view in website configuration Signed-off-by: Vildan Safin --- saas_apps/models/saas_apps.py | 26 +++++++++++--------- saas_apps/views/manage.xml | 45 +++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 11 deletions(-) diff --git a/saas_apps/models/saas_apps.py b/saas_apps/models/saas_apps.py index d126b97e6..a999a0c58 100644 --- a/saas_apps/models/saas_apps.py +++ b/saas_apps/models/saas_apps.py @@ -23,8 +23,9 @@ class SAASLine(models.Model): _name = 'saas.lines' _description = 'Model line' - module_name = fields.Char(default="default") - price = fields.Float(default=0.0) + module_name = fields.Char(default="default", string="Module Name") + price = fields.Float(default=0.0, string="Price") + allow_to_sell = fields.Boolean(string="Sellable") icon_path = fields.Char(compute='_compute_path', string="icon path") dependencies = fields.Many2one('saas.set', string="Module dependences") @@ -38,15 +39,24 @@ def _validate_price(self): raise "Price can't be negative." def add_new_module(self, name): - import wdb - wdb.set_trace() # for module in self: # if(module.module_name == name) # return False self.create({ - 'name': name + 'module_name': name }) return True + + def create(self, cr, user, vals, context=None): + import wdb + wdb.set_trace() + new_id = super(product_test, self).create(cr, user, vals, context) + irmodules = self.env["ir.module.module"].search([]) + if len(irmodules) > len(self.search([])): + for irmodule in irmodules: + if len(self.search([('module_name', '=', irmodule.name)])) == 0: + self.create({'module_name': irmodule.name}) + return new_id class SAASDependence(models.Model): @@ -69,9 +79,3 @@ def add_dependence(self, new_module_name, new_module_price): def _compute_price(self): for module in self.modules: self.final_set_price = self.final_set_price + module.price - - -# class IrModuleModule(models.Model): -# _inherit = "ir.module.module" - -# allow_to_sell = fields.Boolean(default=False) diff --git a/saas_apps/views/manage.xml b/saas_apps/views/manage.xml index 31c4208a0..c039b14ea 100644 --- a/saas_apps/views/manage.xml +++ b/saas_apps/views/manage.xml @@ -23,4 +23,49 @@ + + + saas.lines.search + saas.lines + + + + + + + + + + saas.lines.list + saas.lines + + + + + + + + + + Website Apps + saas.lines + form + tree,form + + current + + + + + + + + + +