💣 Hide 'Choose your packages' when packages are absent

Signed-off-by: Vildan Safin <[email protected]>

saas_apps/data/saas_apps_product_user.xml

@@ -4,11 +4,7 @@
     <record id="product_user" model="product.template">
         <field name="name">User</field>
         <field name="price">10</field>
-<<<<<<< HEAD
-        <field file="saas_apps/static/src/img/user.png" name="image" type="base64" />
-=======
         <field name="website_published">True</field>
         <field file="saas_apps/static/src/img/user.png" name="image_1920" type="base64" />
->>>>>>> 1ea9415... :bomb: Now product.product 'website_published' field related to saas.line's 'allow_to_sell' field
     </record>
 </odoo>

saas_apps/models/saas_apps.py

@@ -101,13 +101,7 @@ def refresh_lines(self):
                         'app_image': base_icon
                     })
 
-<<<<<<< HEAD
     @api.multi
-=======
-    def delete_shit(self, app_name):
-        self.env['product.template'].search([('name', '=', app_name)]).unlink()
-
->>>>>>> 71a60ef... :bomb: Changed product.product model relation to product.template
     def make_product(self, app):
         prod_templ = self.env["product.template"]
         ready_product = prod_templ.search([('name', '=', app.module_name)])
@@ -120,12 +114,8 @@ def make_product(self, app):
             app.product_id += prod_templ.create({
                 'name': app.module_name,
                 'price': app.year_price,
-<<<<<<< HEAD
-                'image': app.app_image
-=======
                 'image_1920': app.app_image,
                 'website_published': True
->>>>>>> 1ea9415... :bomb: Now product.product 'website_published' field related to saas.line's 'allow_to_sell' field
             })
 
     def change_product_price(self, app, price):
@@ -167,15 +157,6 @@ def dependencies_info(self, root):
                     apps.append(leaf)
         return apps
 
-<<<<<<< HEAD
-    @api.multi
-    def change_allow_to_sell(self):
-        this_app = self.dependencies.search([('name', '=', self.name)])
-        for app in self.dependencies - this_app:
-            temp_app = self.search([('name', '=', app.name)])
-            if len(temp_app) > 0:
-                temp_app.allow_to_sell = True
-=======
     def change_allow_to_sell(self, vals, used_apps):
         if not vals['allow_to_sell']:
             vals['used'] = [self] + used_apps
@@ -189,7 +170,6 @@ def change_allow_to_sell(self, vals, used_apps):
                 temp_app = self.search([('name', '=', app.name)])
                 if len(temp_app) > 0:
                     temp_app.allow_to_sell = True
->>>>>>> 1ea9415... :bomb: Now product.product 'website_published' field related to saas.line's 'allow_to_sell' field
 
     @api.multi
     def write(self, vals):
@@ -281,12 +261,8 @@ def create(self, vals):
                 res.product_id += prod.create({
                     'name': res.name,
                     'price': res.year_price,
-<<<<<<< HEAD
-                    'image': res.package_image
-=======
                     'image_1920': res.package_image,
                     'website_published': True
->>>>>>> 1ea9415... :bomb: Now product.product 'website_published' field related to saas.line's 'allow_to_sell' field
                 })
         return res
 

saas_apps/views/calculator.xml

@@ -55,7 +55,7 @@
                     </t>
                     <!-- Packages -->
                     <div class="openerp_enterprise_pricing_step">
-                        <t t-if="show_packages">
+                        <t t-if="show_packages and packages">
                             <h3 class="mt16 mb16">Choose your Packages</h3>
                             <div class="openerp_enterprise_pricing_step_body mb24">
                                 <div class="form-row">