diff --git a/app/assets/javascripts/templates/bulk_buy_modal.html.haml b/app/assets/javascripts/templates/bulk_buy_modal.html.haml index 14ccbdb18f..3346541682 100644 --- a/app/assets/javascripts/templates/bulk_buy_modal.html.haml +++ b/app/assets/javascripts/templates/bulk_buy_modal.html.haml @@ -14,20 +14,20 @@ {{ "js.bulk_buy_modal.min_quantity" | t }} %div %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "add(-1)", disabled: "!canAdd(-1)"}}> - {{ "js.shop_variant_no_group_buy.decrement" | t }} + - %span.bulk-buy.variant-quantity> {{ variant.line_item.quantity }} %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "add(1)", disabled: "!canAdd(1)"}} - {{ "js.shop_variant_no_group_buy.increment" | t }} + + .columns.small-6 .variant-bulk-buy-quantity-label {{ "js.bulk_buy_modal.max_quantity" | t }} %div %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "addMax(-1)", disabled: "!canAddMax(-1)"}}> - {{ "js.shop_variant_no_group_buy.decrement" | t }} + - %span.bulk-buy.variant-quantity> {{ variant.line_item.max_quantity }} %button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "addMax(1)", disabled: "!canAddMax(1)"}} - {{ "js.shop_variant_no_group_buy.increment" | t }} + + %ng-include{src: "'partials/close.html'"} diff --git a/app/assets/javascripts/templates/partials/shop_variant_no_group_buy.html.haml b/app/assets/javascripts/templates/partials/shop_variant_no_group_buy.html.haml index 12572930dd..a26cd6a165 100644 --- a/app/assets/javascripts/templates/partials/shop_variant_no_group_buy.html.haml +++ b/app/assets/javascripts/templates/partials/shop_variant_no_group_buy.html.haml @@ -3,9 +3,9 @@ %button.add-variant{type: "button", ng: {if: "!variant.line_item.quantity", click: "add(1)", disabled: "!canAdd(1)"}} {{ "js.shop_variant_no_group_buy.add" | t }} %button.variant-quantity{type: "button", ng: {if: "variant.line_item.quantity", click: "add(-1)"}}> - {{ "js.shop_variant_no_group_buy.decrement" | t }} + - %button.variant-quantity{type: "button", ng: {if: "variant.line_item.quantity", click: "add(1)", disabled: "!canAdd(1)"}} - {{ "js.shop_variant_no_group_buy.increment" | t }} + + %br .variant-quantity-display{ng: {class: "{visible: variant.line_item.quantity}"}} {{ "js.shop_variant_no_group_buy.in_cart" | t:{quantity: variant.line_item.quantity || 0} }} diff --git a/config/locales/en.yml b/config/locales/en.yml index 9c7b86f73a..bd3457b6bf 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2728,8 +2728,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using only_n_remainging: "now only has %{num} remaining." shop_variant_no_group_buy: add: "Add" - increment: "+" # U+FF0B Fullwidth Plus Sign - decrement: "-" # U+FF0D Fullwidth Hyphen-Minus in_cart: "%{quantity} in cart" bulk_buy_modal: min_quantity: "Min quantity"