Fixes mrvautin#37

nicoangelico · Feb 10, 2019 · 52828cb · 52828cb
1 parent 0ce3a16
commit 52828cb
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 8 deletions.
diff --git a/public/javascripts/expressCart.js b/public/javascripts/expressCart.js
@@ -757,9 +757,16 @@ function updateCartDiv(){
 function getSelectedOptions(){
     var options = {};
     $('.product-opt').each(function(){
-        options[$(this).attr('name')] = $(this).val();
+        if($(this).attr('name') === 'opt-'){
+            options[$(this).val().trim()] = $(this).prop('checked');
+            return;
+        }
+        var optionValue = $(this).val().trim();
+        if($(this).attr('type') === 'radio'){
+            optionValue = $('input[name="' + $(this).attr('name') + '"]:checked').val();
+        }
+        options[$(this).attr('name').substring(4, $(this).attr('name').length)] = optionValue;
     });
-
     return options;
 }
 

diff --git a/public/javascripts/expressCart.min.js b/public/javascripts/expressCart.min.js
diff --git a/views/order.hbs b/views/order.hbs
@@ -51,9 +51,9 @@
                         (
                         {{#each this.options}}
                             {{#if @last}}
-                                {{this}}
+                                {{@key}}: {{this}}
                             {{else}}
-                                {{this}} /
+                                {{@key}}: {{this}} /
                             {{/if}}
                         {{/each}}
                         )

diff --git a/views/themes/Cloth/cart.hbs b/views/themes/Cloth/cart.hbs
@@ -23,7 +23,14 @@
                                 <a class="cart-link" href="/product/{{this.link}}">{{this.title}}</a>
                             </p>
                             <p>
-                                &nbsp;{{#each this.options}} {{#if @last}} {{this}} {{else}} {{this}} / {{/if}} {{/each}}
+                                &nbsp;
+                                {{#each this.options}} 
+                                    {{#if @last}} 
+                                        {{@key}}: {{this}} 
+                                        {{else}} 
+                                        {{@key}}: {{this}} / 
+                                    {{/if}} 
+                                {{/each}}
                             </p>
                             <p>
                                 <div class="form-group">

diff --git a/views/themes/Material/cart.hbs b/views/themes/Material/cart.hbs
@@ -22,7 +22,14 @@
                             <a class="cart-link" href="/product/{{this.link}}">{{this.title}}</a>
                         </p>
                         <p>
-                            &nbsp;{{#each this.options}} {{#if @last}} {{this}} {{else}} {{this}} / {{/if}} {{/each}}
+                            &nbsp;
+                            {{#each this.options}} 
+                                {{#if @last}} 
+                                    {{@key}}: {{this}} 
+                                    {{else}} 
+                                    {{@key}}: {{this}} / 
+                                {{/if}} 
+                            {{/each}}
                         </p>
                         <p>
                             <div class="col s12 no-pad-left">

diff --git a/views/themes/Mono/cart.hbs b/views/themes/Mono/cart.hbs
@@ -22,7 +22,14 @@
                             <a class="cart-link" href="/product/{{this.link}}">{{this.title}}</a>
                         </p>
                         <p>
-                            &nbsp;{{#each this.options}} {{#if @last}} {{this}} {{else}} {{this}} / {{/if}} {{/each}}
+                            &nbsp;
+                            {{#each this.options}} 
+                                {{#if @last}} 
+                                    {{@key}}: {{this}} 
+                                    {{else}} 
+                                    {{@key}}: {{this}} / 
+                                {{/if}} 
+                            {{/each}}
                         </p>
                         <p>
                             <div class="col s12 no-pad-left">