Merge branch 'odoo-backup' of bitbucket.org:altafixco/indoteknik-addons into cr_renca_find

merge

2 files changed, 11 insertions, 7 deletions

diff --git a/indoteknik_custom/models/solr/apache_solr.py b/indoteknik_custom/models/solr/apache_solr.py
index c2283421..21fb15d2 100644
--- a/indoteknik_custom/models/solr/apache_solr.py
+++ b/indoteknik_custom/models/solr/apache_solr.py
@@ -7,12 +7,12 @@ import time
 from odoo.tools.config import config
 
 _logger = logging.getLogger(__name__)
-# _solr = pysolr.Solr('http://10.148.0.5:8983/solr/product/', always_commit=True, timeout=30)
-# _variants_solr = pysolr.Solr('http://10.148.0.5:8983/solr/variants/', always_commit=True, timeout=30)
-# _recommendation_solr = pysolr.Solr('http://10.148.0.5:8983/solr/recommendation/', always_commit=True, timeout=30)
-_solr = pysolr.Solr('http://localhost:8983/solr/product/', always_commit=True, timeout=30)
-_variants_solr = pysolr.Solr('http://localhost:8983/solr/variants/', always_commit=True, timeout=30)
-_recommendation_solr = pysolr.Solr('http://localhost:8983/solr/recommendation/', always_commit=True, timeout=30)
+_solr = pysolr.Solr('http://10.148.0.5:8983/solr/product/', always_commit=True, timeout=30)
+_variants_solr = pysolr.Solr('http://10.148.0.5:8983/solr/variants/', always_commit=True, timeout=30)
+_recommendation_solr = pysolr.Solr('http://10.148.0.5:8983/solr/recommendation/', always_commit=True, timeout=30)
+# _solr = pysolr.Solr('http://35.219.88.139/solr/product/', always_commit=True, timeout=30)
+# _variants_solr = pysolr.Solr('http://35.219.88.139/solr/variants/', always_commit=True, timeout=30)
+# _recommendation_solr = pysolr.Solr('http://35.219.88.139/solr/recommendation/', always_commit=True, timeout=30)
 # _solr = pysolr.Solr('http://34.101.189.218:8983/solr/product/', always_commit=True, timeout=30) # for development only
 
 
@@ -27,7 +27,7 @@ class ApacheSolr(models.Model):
         if env == 'development':
             url = 'http://localhost:8983/solr/'
         elif env == 'production':
-            url = 'http://locahost:8983/solr/'
+            url = 'http://34.101.189.218:8983/solr/'
         
         return pysolr.Solr(url + schema, always_commit=False, timeout=10)
 
@@ -258,6 +258,7 @@ class ApacheSolr(models.Model):
                 'id': variant.id,
                 'display_name_s': variant.display_name,
                 'name_s': variant.name,
+                'search_keywords_t': variant.display_name,
                 'default_code_s': variant.default_code or '',
                 'product_rating_f': variant.product_tmpl_id.virtual_rating,
                 'product_id_i': variant.id,
@@ -269,6 +270,7 @@ class ApacheSolr(models.Model):
                 'tax_f': tax,
                 'stock_total_f': variant.qty_stock_vendor,
                 'weight_f': variant.product_tmpl_id.weight,
+                'has_magento_b': variant.has_magento,
                 'attribute_set_id_i': variant.product_tmpl_id.x_attribute_set_id or 0,
                 'attribute_set_name_s': variant.product_tmpl_id.x_attribute_set_name or '',
                 'manufacture_id_i': variant.product_tmpl_id.x_manufacture.id or 0,
diff --git a/indoteknik_custom/models/solr/product_product.py b/indoteknik_custom/models/solr/product_product.py
index 7df56e57..a90bcb98 100644
--- a/indoteknik_custom/models/solr/product_product.py
+++ b/indoteknik_custom/models/solr/product_product.py
@@ -64,6 +64,7 @@ class ProductProduct(models.Model):
                 'id': variant.id,
                 'display_name_s': variant.display_name,
                 'name_s': variant.name,
+                'search_keywords_t': variant.display_name,
                 'default_code_s': variant.default_code or '',
                 'product_rating_f': variant.product_tmpl_id.virtual_rating,
                 'product_id_i': variant.id,
@@ -73,6 +74,7 @@ class ProductProduct(models.Model):
                 'image_mobile_s': ir_attachment.api_image('product.template', 'image_256', variant.product_tmpl_id.id),
                 'stock_total_f': variant.qty_free_bandengan,
                 'weight_f': variant.weight,
+                'has_magento_b': variant.has_magento,
                 'attribute_set_id_i': variant.product_tmpl_id.x_attribute_set_id or 0,
                 'attribute_set_name_s': variant.product_tmpl_id.x_attribute_set_name or '',
                 'manufacture_id_i': variant.product_tmpl_id.x_manufacture.id or 0,