Merge branch 'feature/coupon' into release/180420

@@ -21,9 +21,9 @@
             {{#each ./coupons}}
             {{#each ./coupons}}
                 <div class="coupon{{#isEqualOr is_selected_support 'N'}} no-support-selected{{/isEqualOr}}" data-code="{{coupon_code}}">
                 <div class="coupon{{#isEqualOr is_selected_support 'N'}} no-support-selected{{/isEqualOr}}" data-code="{{coupon_code}}">
                     <div class="coupon-left{{#isEqualOr is_selected_support 'Y'}}
                     <div class="coupon-left{{#isEqualOr is_selected_support 'Y'}}
-                        {{#isEqualOr coupon_type '1' '3' '8'}} coupon-left-activity{{/isEqualOr}}
-                        {{#isEqualOr coupon_type '5'}} coupon-left-freight{{/isEqualOr}}
-                        {{#isEqualOr coupon_type '6'}} coupon-left-shop{{/isEqualOr}}
+                        {{#isEqualOr catalog 200}} coupon-left-activity{{/isEqualOr}}
+                        {{#isEqualOr catalog 300}} coupon-left-freight{{/isEqualOr}}
+                        {{#isEqualOr catalog 100}} coupon-left-shop{{/isEqualOr}}
                     {{/isEqualOr}}">
                     {{/isEqualOr}}">
                         <p class="value">
                         <p class="value">
                             <span>{{coupon_value_str}}</span>
                             <span>{{coupon_value_str}}</span>
@@ -59,7 +59,7 @@
             {{/if}}
             {{/if}}
             {{#each ./coupons}}
             {{#each ./coupons}}
                 <div class="coupon">
                 <div class="coupon">
-                    <div class="coupon-left{{#isEqualOr coupon_type '1' '3' '8'}} coupon-left-activity{{/isEqualOr}}{{#isEqualOr coupon_type '5'}} coupon-left-freight{{/isEqualOr}}{{#isEqualOr coupon_type '6'}} coupon-left-shop{{/isEqualOr}}">
+                    <div class="coupon-left{{#isEqualOr catalog 200}} coupon-left-activity{{/isEqualOr}}{{#isEqualOr catalog 300}} coupon-left-freight{{/isEqualOr}}{{#isEqualOr catalog 100}} coupon-left-shop{{/isEqualOr}}">
                         <p class="value">
                         <p class="value">
                             <span>{{coupon_value_str}}</span>
                             <span>{{coupon_value_str}}</span>
                         </p>
                         </p>
@@ -68,7 +68,7 @@
                     <div class="coupon-right">
                     <div class="coupon-right">
                         <div class="info">
                         <div class="info">
                             <p class="title">
                             <p class="title">
-                                <span class="{{#isEqualOr coupon_type '1' '3' '8'}} type-activity{{/isEqualOr}}{{#isEqualOr coupon_type '5'}} type-freight{{/isEqualOr}}{{#isEqualOr coupon_type '6'}} type-shop{{/isEqualOr}}">[{{catalog_name}}]</span> {{coupon_name}}</p>
+                                <span class="{{#isEqualOr catalog 200}} type-activity{{/isEqualOr}}{{#isEqualOr catalog 300}} type-freight{{/isEqualOr}}{{#isEqualOr catalog 100}} type-shop{{/isEqualOr}}">[{{catalog_name}}]</span> {{coupon_name}}</p>
                             <p class="time">{{coupon_validity}}</p>
                             <p class="time">{{coupon_validity}}</p>
                             <p class="desc unusable-desc">{{desc}}</p>
                             <p class="desc unusable-desc">{{desc}}</p>
                         </div>
                         </div>

 <section class="coupon-section" data-code="{{coupon_code}}" data-id="{{coupon_id}}">
 <section class="coupon-section" data-code="{{coupon_code}}" data-id="{{coupon_id}}">
     <div class="coupon{{#isEqualOr is_overtime 'Y'}} coupon-overtime{{/isEqualOr}}{{#if is_used}} coupon-used{{/if}}">
     <div class="coupon{{#isEqualOr is_overtime 'Y'}} coupon-overtime{{/isEqualOr}}{{#if is_used}} coupon-used{{/if}}">
-        <div class="coupon-left{{#unless usedOrOvertime}}{{#isEqualOr coupon_type '1' '3' '8'}} coupon-left-activity{{/isEqualOr}}{{#isEqualOr coupon_type '5'}} coupon-left-freight{{/isEqualOr}}{{#isEqualOr coupon_type '6'}} coupon-left-shop{{/isEqualOr}}{{/unless}}">
+        <div class="coupon-left{{#unless usedOrOvertime}}{{#isEqualOr catalog 200}} coupon-left-activity{{/isEqualOr}}{{#isEqualOr catalog 300}} coupon-left-freight{{/isEqualOr}}{{#isEqualOr catalog 100}} coupon-left-shop{{/isEqualOr}}{{/unless}}">
             <p class="value"><span>{{coupon_value_str}}</span></p>
             <p class="value"><span>{{coupon_value_str}}</span></p>
             {{#if use_rule}}
             {{#if use_rule}}
             <p class="threshold">{{use_rule}}</p>
             <p class="threshold">{{use_rule}}</p>
@@ -8,7 +8,7 @@
         </div>
         </div>
         <div class="coupon-right">
         <div class="coupon-right">
             <p class="title">
             <p class="title">
-                <span class="{{#isEqualOr coupon_type '1' '3'}}type-activity{{/isEqualOr}}{{#isEqualOr coupon_type '5'}}type-freight{{/isEqualOr}}{{#isEqualOr coupon_type '6'}}type-shop{{/isEqualOr}}">[{{catalog_name}}]</span> {{coupon_name}}</p>
+                <span class="{{#isEqualOr catalog 200}}type-activity{{/isEqualOr}}{{#isEqualOr catalog 300}}type-freight{{/isEqualOr}}{{#isEqualOr catalog 100}}type-shop{{/isEqualOr}}">[{{catalog_name}}]</span> {{coupon_name}}</p>
             <p class="time">{{coupon_validity}}</p>
             <p class="time">{{coupon_validity}}</p>
             {{#if notes}}
             {{#if notes}}
             <p>
             <p>

@@ -301,7 +301,7 @@ $yohoPage.on('touchstart', '.tap-hightlight', function() {
     $(this).removeClass('highlight');
     $(this).removeClass('highlight');
 });
 });
 
 
-$('.nav-home').on('touchstart', function(e) {
+$('.new-nav-home').on('touchstart', function(e) {
     $('.homebuttom').toggleClass('hide');
     $('.homebuttom').toggleClass('hide');
     e.preventDefault();
     e.preventDefault();
     e.stopPropagation();
     e.stopPropagation();