Added product brand

EranGoldman · Oct 21, 2020 · 1bb314c · 1bb314c
1 parent eba4c1a
commit 1bb314c
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 10 deletions.
diff --git a/lib/schemas/editProduct.json b/lib/schemas/editProduct.json
@@ -29,6 +29,10 @@
             "format": "alphanumeric",
             "maxLength": 16
         },
+        "productBrand": {
+            "type": "string",
+            "maxLength": 50
+        },
         "productPublished": {
             "type": "boolean"
         },

diff --git a/lib/schemas/newProduct.json b/lib/schemas/newProduct.json
@@ -26,6 +26,10 @@
             "format": "alphanumeric",
             "maxLength": 16
         },
+        "productBrand": {
+            "type": "string",
+            "maxLength": 50
+        },
         "productPublished": {
             "type": "boolean"
         },

diff --git a/locales/en.json b/locales/en.json
@@ -223,5 +223,7 @@
 	"Reviews can be filtered by: review title or review description keywords": "Reviews can be filtered by: review title or review description keywords",
 	"Reviews": "Reviews",
 	"Product GTIN": "Product GTIN",
-	"The Serial number, GTIN or Barcode": "The Serial number, GTIN or Barcode"
+	"The Serial number, GTIN or Barcode": "The Serial number, GTIN or Barcode",
+	"Product Brand": "Product Brand",
+	"The brand of the product": "The brand of the product"
 }
diff --git a/public/javascripts/admin.js b/public/javascripts/admin.js
@@ -218,6 +218,7 @@ $(document).ready(function (){
                     productStock: $('#productStock').val(),
                     productDescription: $('#productDescription').val(),
                     productGtin: $('#productGtin').val(),
+                    productBrand: $('#productBrand').val(),
                     productPermalink: $('#productPermalink').val(),
                     productSubscription: $('#productSubscription').val(),
                     productComment: $('#productComment').is(':checked'),
@@ -257,6 +258,7 @@ $(document).ready(function (){
                     productStockDisable: $('#productStockDisable').is(':checked'),
                     productDescription: $('#productDescription').val(),
                     productGtin: $('#productGtin').val(),
+                    productBrand: $('#productBrand').val(),
                     productPermalink: $('#productPermalink').val(),
                     productSubscription: $('#productSubscription').val(),
                     productComment: $('#productComment').is(':checked'),

diff --git a/public/javascripts/admin.min.js b/public/javascripts/admin.min.js
diff --git a/routes/product.js b/routes/product.js
@@ -103,6 +103,7 @@ router.post('/admin/product/insert', restrict, checkAccess, async (req, res) =>
         productPrice: req.body.productPrice,
         productDescription: cleanHtml(req.body.productDescription),
         productGtin: cleanHtml(req.body.productGtin),
+        productBrand: cleanHtml(req.body.productBrand),
         productPublished: convertBool(req.body.productPublished),
         productTags: req.body.productTags,
         productComment: checkboxBool(req.body.productComment),
@@ -328,6 +329,7 @@ router.post('/admin/product/update', restrict, checkAccess, async (req, res) =>
         productPrice: req.body.productPrice,
         productDescription: cleanHtml(req.body.productDescription),
         productGtin: cleanHtml(req.body.productGtin),
+        productBrand: cleanHtml(req.body.productBrand),
         productPublished: convertBool(req.body.productPublished),
         productTags: req.body.productTags,
         productComment: checkboxBool(req.body.productComment),

diff --git a/views/layouts/layout.hbs b/views/layouts/layout.hbs
@@ -133,6 +133,12 @@
                 {{else}}
                 "image": "{{config.baseUrl}}uploads/placeholder.png",
                 {{/if}}
+                {{#if result.productBrand}}
+                "brand": {
+                    "@type": "Organization",
+                    "name": "{{result.productBrand}}"
+                },
+                {{/if}}
                 "aggregateRating": {
                     "@type": "AggregateRating",
                     "ratingValue": "{{@root.reviewRating}}",

diff --git a/views/product-edit.hbs b/views/product-edit.hbs
@@ -17,7 +17,7 @@
                 </div>
             </div>
             <div class="row ml-0 mr-0">
-                <div class="col-sm-4">
+                <div class="col-sm-3">
                     <div class="form-group">
                         <label for="productPrice" class="control-label">{{ @root.__ "Product price" }} *</label>
                         <div class="input-group">
@@ -28,20 +28,25 @@
                         </div>
                     </div>
                 </div>
-                <div class="col-sm-4">
+                <div class="col-sm-3">
                     <div class="form-group">
-                        <label for="productPublished" class="control-label">{{ @root.__ "Status" }}</label>
+                        <label for="productPublished" class="control-label">{{ @root.__ "Status" }} *</label>
                         <select class="form-control" id="productPublished">
                             <option value="true"  {{selectState result.productPublished "true"}}>{{ @root.__ "Published" }}</option>
                             <option value="false" {{selectState result.productPublished "false"}}>{{ @root.__ "Draft" }}</option>
                         </select>
                     </div>
                 </div>
-                <div class="col-sm-4">
+                <div class="col-sm-3">
                     <div class="form-group">
                         <label for="productGtin" class="control-label">{{ @root.__ "Product GTIN" }}</label>
-                        {{!-- <input type="number" id="productGtin" class="form-control" value="{{result.productGtin}}" step="any" /> --}}
-                        <input type="string" id="productGtin" class="form-control" value="{{result.productGtin}}"/>
+                        <input type="number" id="productGtin" class="form-control" value="{{result.productGtin}}" step="any" />
+                    </div>
+                </div>
+                <div class="col-sm-3">
+                    <div class="form-group">
+                        <label for="productBrand" class="control-label">{{ @root.__ "Product Brand" }}</label>
+                        <input type="text" id="productBrand" class="form-control" value="{{result.productBrand}}" />
                     </div>
                 </div>
             </div>

diff --git a/views/product-new.hbs b/views/product-new.hbs
@@ -16,7 +16,7 @@
             </div>
         </div>
         <div class="row ml-0 mr-0">
-            <div class="col-sm-6">
+            <div class="col-sm-4">
                 <div class="form-group">
                     <label for="productPrice" class="control-label">{{ @root.__ "Product price" }} *</label>
                     <div class="input-group">
@@ -27,7 +27,7 @@
                     </div>
                 </div>
             </div>
-            <div class="col-sm-6">
+            <div class="col-sm-4">
                 <div class="form-group">
                     <label for="productGtin" class="control-label">{{ @root.__ "Product GTIN" }}</label>
                     <div class="input-group">
@@ -36,6 +36,15 @@
                     <p class="help-block">{{ @root.__ "The Serial number, GTIN or Barcode" }}</p>
                 </div>
             </div>
+            <div class="col-sm-4">
+                <div class="form-group">
+                    <label for="productBrand" class="control-label">{{ @root.__ "Product Brand" }}</label>
+                    <div class="input-group">
+                        <input type="text" id="productBrand" class="form-control" value="{{productBrand}}" />
+                    </div>
+                    <p class="help-block">{{ @root.__ "The brand of the product" }}</p>
+                </div>
+            </div>
         </div>
         <div class="row ml-0 mr-0">
             <div class="col-sm-6">