raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade HAML syntax with script

Browse Source
This commit is contained in:
Maikel Linke
2024-02-02 08:51:57 +11:00
parent 4516d90ede
commit c097f2b622
171 changed files with 928 additions and 1028 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/templates/active_selector.html.haml
View File

@@ -1,3 +1,2 @@
%li{ ng: { class: "{active: selector.active}" } }
%a{ "tooltip" => "{{selector.object.value}}", "tooltip-placement" => "bottom",
ng: { transclude: true, class: "{active: selector.active, 'has-tip': selector.object.value}" } }
%li{ "ng-class" => "{active: selector.active}" }
%a{ "tooltip" => "{{selector.object.value}}", "tooltip-placement" => "bottom", "ng-transclude" => true, "ng-class" => "{active: selector.active, 'has-tip': selector.object.value}" }

8
app/assets/javascripts/templates/admin/alert_row.html.haml
View File

@@ -1,8 +1,8 @@
.sixteen.columns.alpha.omega.alert-row{ ng: { show: '!dismissed' } }
.sixteen.columns.alpha.omega.alert-row{ "ng-show" => '!dismissed' }
.fifteen.columns.pad.alpha
%span.message.text-big{ ng: { bind: 'message'} }
%span.message.text-big{ "ng-bind" => 'message' }
   
%input{ type: 'button', ng: { value: "buttonText", show: 'buttonText && buttonAction', click: "buttonAction()" } }
%input{ "type" => 'button', "ng-value" => "buttonText", "ng-show" => 'buttonText && buttonAction', "ng-click" => "buttonAction()" }
.one.column.omega.pad.text-center
%a.close{ href: "#", ng: { click: "dismiss()" } }
%a.close{ "href" => "#", "ng-click" => "dismiss()" }
×

10
app/assets/javascripts/templates/admin/columns_dropdown.html.haml
View File

@@ -1,13 +1,13 @@
.ofn-drop-down.ofn-drop-down-v2.right#columns-dropdown{ ng: { controller: 'ColumnsDropdownCtrl' } }
.ofn-drop-down.ofn-drop-down-v2.right#columns-dropdown{ "ng-controller" => 'ColumnsDropdownCtrl' }
.ofn-drop-down-label
= "  #{t('admin.columns')}".html_safe
%span{ 'ng-class' => "expanded && 'icon-caret-up' || !expanded && 'icon-caret-down'" }
%div.menu{ 'ng-show' => "expanded" }
.menu_items
.menu_item{ ng: { repeat: "column in columns", click: "toggle(column);" } }
%input.redesigned-input{ type: "checkbox", ng: { checked: "column.visible" } }
.menu_item{ "ng-repeat" => "column in columns", "ng-click" => "toggle(column);" }
%input.redesigned-input{ "type" => "checkbox", "ng-checked" => "column.visible" }
{{ column.name }}
%hr
%div.menu_item.text-center
%input.fullwidth.orange{ type: "button", ng: { value: "saved() ? 'Saved': 'Saving'", show: "saved() || saving", disabled: "saved()" } }
%input.fullwidth.red{ type: "button", :value => t('admin.column_save_as_default').html_safe, ng: { show: "!saved() && !saving", click: "saveColumnPreferences(action)"} }
%input.fullwidth.orange{ "type" => "button", "ng-value" => "saved() ? 'Saved': 'Saving'", "ng-show" => "saved() || saving", "ng-disabled" => "saved()" }
%input.fullwidth.red{ "type" => "button", "value" => t('admin.column_save_as_default').html_safe, "ng-show" => "!saved() && !saving", "ng-click" => "saveColumnPreferences(action)" }

8
app/assets/javascripts/templates/admin/confirm_dialog.html.haml
View File

@@ -1,8 +1,8 @@
#confirm-dialog{ ng: { class: "dialog_class" } }
#confirm-dialog{ "ng-class" => "dialog_class" }
.message.clearfix.margin-bottom-30
.icon.text-center
%i.icon-question-sign
.text{ ng: { bind: "::message" } }
.text{ "ng-bind" => "::message" }
.action-buttons.text-center
%button.cancel{ ng: { click: "close()", bind: "::cancelText" } }
%button.confirm.red{ ng: { click: "confirm()", bind: "::confirmText" } }
%button.cancel{ "ng-click" => "close()", "ng-bind" => "::cancelText" }
%button.confirm.red{ "ng-click" => "confirm()", "ng-bind" => "::confirmText" }

28
app/assets/javascripts/templates/admin/edit_address_dialog.html.haml
View File

@@ -1,12 +1,12 @@
#edit-address-dialog
%h2 {{ addressType === 'bill_address' ? "#{t('admin.customers.index.edit_bill_address')}" : "#{t('admin.customers.index.edit_ship_address')}" }}
%form{ name: 'edit_address_form', novalidate: true, ng: { submit: 'updateAddress()'}}
%form{ "name" => 'edit_address_form', "novalidate" => true, "ng-submit" => 'updateAddress()' }
.row
{{ 'admin.customers.index.required_fileds' | t }}
(
%span.required *
)
.error{ ng: { repeat: "error in errors", bind: "error" } }
.error{ "ng-repeat" => "error in errors", "ng-bind" => "error" }
%table.no-borders
%tr
@@ -14,61 +14,55 @@
{{ 'first_name' | t }}
%span.required *
%td
%input{ type: 'text', name: 'firstname', required: true, ng: { model: 'address.firstname'} }
%input{ "type" => 'text', "name" => 'firstname', "required" => true, "ng-model" => 'address.firstname' }
%tr
%td
{{ 'last_name' | t }}
%span.required *
%td
%input{ type: 'text', name: 'lastname', required: true, ng: { model: 'address.lastname'} }
%input{ "type" => 'text', "name" => 'lastname', "required" => true, "ng-model" => 'address.lastname' }
%tr
%td
{{ 'address' | t }}
%span.required *
%td
%input{ type: 'text', name: 'address1', required: true, ng: { model: 'address.address1'} }
%input{ "type" => 'text', "name" => 'address1', "required" => true, "ng-model" => 'address.address1' }
%tr
%td
{{ 'address2' | t }}
%td
%input{ type: 'text', name: 'address2', ng: { model: 'address.address2'} }
%input{ "type" => 'text', "name" => 'address2', "ng-model" => 'address.address2' }
%tr
%td
{{ 'city' | t }}
%span.required *
%td
%input{ type: 'text', name: 'city', required: true, ng: { model: 'address.city'} }
%input{ "type" => 'text', "name" => 'city', "required" => true, "ng-model" => 'address.city' }
%tr
%td
{{ 'postcode' | t }}
%span.required *
%td
%input{ type: 'text', name: 'zipcode', required: true, ng: { model: 'address.zipcode'} }
%input{ "type" => 'text', "name" => 'zipcode', "required" => true, "ng-model" => 'address.zipcode' }
%tr
%td
{{ 'country' | t }}
%span.required *
%td
%input.ofn-select2.fullwidth#country_id{ type: 'number',
name: 'country_id', required: true,
placeholder: "{{ 'admin.customers.index.select_country' | t }}",
data: 'availableCountries', ng: { model: 'address.country_id' } }
%input.ofn-select2.fullwidth#country_id{ "type" => 'number', "name" => 'country_id', "required" => true, "placeholder" => "{{ 'admin.customers.index.select_country' | t }}", "data" => 'availableCountries', "ng-model" => 'address.country_id' }
%tr
%td
{{ 'state' | t }}
%span.required *
%td
%input.ofn-select2.fullwidth#state_id{ type: 'number',
name: 'state_id', required: true,
placeholder: "{{ 'admin.customers.index.select_state' | t }}",
data: 'states', ng: { model: 'address.state_id' } }
%input.ofn-select2.fullwidth#state_id{ "type" => 'number', "name" => 'state_id', "required" => true, "placeholder" => "{{ 'admin.customers.index.select_state' | t }}", "data" => 'states', "ng-model" => 'address.state_id' }
%tr
%td
{{ 'phone' | t }}
%span.required *
%td
%input{ type: 'text', name: 'phone', required: true, ng: { model: 'address.phone'} }
%input{ "type" => 'text', "name" => 'phone', "required" => true, "ng-model" => 'address.phone' }
.text-center
%input.button.red.icon-plus{ type: 'submit', value: t('admin.customers.index.update_address')}

6
app/assets/javascripts/templates/admin/info_dialog.html.haml
View File

@@ -1,9 +1,9 @@
#info-dialog{ ng: { class: "dialog_class" } }
#info-dialog{ "ng-class" => "dialog_class" }
.message.clearfix.margin-bottom-30
.icon.text-center
%i{ ng: { class: "icon_class" } }
%i{ "ng-class" => "icon_class" }
.text
{{ message }}
.action-buttons.text-center
%button{ ng: { click: "close()" } }
%button{ "ng-click" => "close()" }
= t(:ok)

10
app/assets/javascripts/templates/admin/modals/bulk_invoice.html.haml
View File

@@ -1,15 +1,15 @@
%h4.modal-title
= t('js.admin.orders.index.compiling_invoices')
%p.message{ ng: { show: 'message' } }
%p.message{ "ng-show" => 'message' }
{{message}}
%p.error{ ng: { show: 'error' } }
%p.error{ "ng-show" => 'error' }
{{error}}
%img.spinner{ src: image_path("/spinning-circles.svg"), ng: { show: "loading" } }
%p{ ng: { show: "loading" } }
%img.spinner{ "src" => image_path("/spinning-circles.svg"), "ng-show" => "loading" }
%p{ "ng-show" => "loading" }
= t('js.admin.orders.index.please_wait')
%a.button{ target: '_blank', ng: { click: 'showBulkInvoice()', href: '/admin/orders/invoices/{{invoice_id}}', show: "!loading && !error" } }
%a.button{ "target" => '_blank', "ng-click" => 'showBulkInvoice()', "ng-href" => '/admin/orders/invoices/{{invoice_id}}', "ng-show" => "!loading && !error" }
= t('js.admin.orders.index.view_file')

6
app/assets/javascripts/templates/admin/modals/image_upload.html.haml
View File

@@ -1,10 +1,10 @@
%a.close-reveal-modal{"ng-click" => "$close()"}
%i.fa.fa-times-circle{'aria-hidden' => "true"}
%form#image_upload{ name: 'form', novalidate: true, enctype: 'multipart/form-data', multipart: true, ng: { controller: "ProductImageCtrl" } }
%form#image_upload{ "name" => 'form', "novalidate" => true, "enctype" => 'multipart/form-data', "multipart" => true, "ng-controller" => "ProductImageCtrl" }
%div.image-preview
%img.spinner{ src: image_path("/spinning-circles.svg"), ng: { hide: "!imageUploader.isUploading" }}
%img.preview{ng: {src: "{{imagePreview}}", class: "{'faded': imageUploader.isUploading}"}}
%img.spinner{ "src" => image_path("/spinning-circles.svg"), "ng-hide" => "!imageUploader.isUploading" }
%img.preview{ "ng-src" => "{{imagePreview}}", "ng-class" => "{'faded': imageUploader.isUploading}" }
%label{for: 'image-upload', class: 'button'} {{ 'admin.products.index.upload_an_image' | t }}
%input#image-upload{hidden: true, type: 'file', 'nv-file-select' => true, uploader: "imageUploader"}

10
app/assets/javascripts/templates/admin/new_customer_dialog.html.haml
View File

@@ -2,14 +2,14 @@
.text-normal.margin-bottom-30.text-center
{{ 'js.admin.customers.index.add_a_new_customer_for' | t:{ shop_name: CurrentShop.shop.name } }}
%form{ name: 'new_customer_form', novalidate: true, ng: { submit: "addCustomer()" }}
%form{ "name" => 'new_customer_form', "novalidate" => true, "ng-submit" => "addCustomer()" }
.text-center.margin-bottom-30
%input.fullwidth{ type: 'email', name: 'email', required: true, placeholder: "{{ 'js.admin.customers.index.customer_placeholder' | t }}", ng: { model: "email" } }
%div{ ng: { show: "submitted && new_customer_form.$pristine" } }
.error{ ng: { show: "(new_customer_form.email.$error.email || new_customer_form.email.$error.required)" } }
%input.fullwidth{ "type" => 'email', "name" => 'email', "required" => true, "placeholder" => "{{ 'js.admin.customers.index.customer_placeholder' | t }}", "ng-model" => "email" }
%div{ "ng-show" => "submitted && new_customer_form.$pristine" }
.error{ "ng-show" => "(new_customer_form.email.$error.email || new_customer_form.email.$error.required)" }
{{ 'js.admin.customers.index.valid_email_error' | t }}
.error{ ng: { repeat: "error in errors", bind: "error" } }
.error{ "ng-repeat" => "error in errors", "ng-bind" => "error" }
.text-center
%input.button.red.icon-plus{ type: 'submit', value: "{{ 'js.admin.customers.index.add_customer' | t }}" }

4
app/assets/javascripts/templates/admin/new_tag_rule_dialog.html.haml
View File

@@ -4,7 +4,7 @@
.text-center.margin-bottom-30
-# %select.fullwidth{ 'select2-min-search' => 5, 'ng-model' => 'newRuleType', 'ng-options' => 'ruleType.id as ruleType.name for ruleType in availableRuleTypes' }
%input.ofn-select2.fullwidth{ :id => 'rule_type_selector', ng: { model: "ruleType" }, data: "ruleTypes", 'min-search' => "5" }
%input.ofn-select2.fullwidth{ "id" => 'rule_type_selector', "data" => "ruleTypes", "min-search" => "5", "ng-model" => "ruleType" }
.text-center
%input.button.red.icon-plus{ type: 'button', value: "{{ 'js.admin.new_tag_rule_dialog.add_rule' | t }}", ng: { click: 'addRule(tagGroup, ruleType)' } }
%input.button.red.icon-plus{ "type" => 'button', "value" => "{{ 'js.admin.new_tag_rule_dialog.add_rule' | t }}", "ng-click" => 'addRule(tagGroup, ruleType)' }

10
app/assets/javascripts/templates/admin/order_cycles_selector.html.haml
View File

@@ -3,16 +3,16 @@
%td#available-order-cycles
{{ 'js.admin.order_cycles.schedules.available' | t }}
.order-cycles
.order-cycle{ ng: { repeat: 'orderCycle in orderCycles | available:selectedOrderCycles as availableOrderCycles', click: 'selections.available = orderCycle', dblclick: 'add(orderCycle)', class: '{selected: selections.available == orderCycle}' } }
.order-cycle{ "ng-repeat" => 'orderCycle in orderCycles | available:selectedOrderCycles as availableOrderCycles', "ng-click" => 'selections.available = orderCycle', "ng-dblclick" => 'add(orderCycle)', "ng-class" => '{selected: selections.available == orderCycle}' }
{{ orderCycle.name }}
%td#add-remove-buttons
%a.add.button{ href: 'javascript:void(0)', ng: { click: 'add()' } }
%a.add.button{ "href" => 'javascript:void(0)', "ng-click" => 'add()' }
%i.icon-chevron-right
%a.remove.button{ href: 'javascript:void(0)', ng: { click: 'remove()' } }
%a.remove.button{ "href" => 'javascript:void(0)', "ng-click" => 'remove()' }
%i.icon-chevron-left
%td#selected-order-cycles
{{ 'js.admin.order_cycles.schedules.selected' | t }}
.order-cycles
.order-cycle{ ng: { repeat: 'orderCycle in selectedOrderCycles', click: 'selections.selected = orderCycle', dblclick: 'remove(orderCycle)', class: '{selected: selections.selected == orderCycle}' } }
.order-cycle{ "ng-repeat" => 'orderCycle in selectedOrderCycles', "ng-click" => 'selections.selected = orderCycle', "ng-dblclick" => 'remove(orderCycle)', "ng-class" => '{selected: selections.selected == orderCycle}' }
{{ orderCycle.name }}
.error{ ng: { repeat: "error in errors", bind: "error" } }
.error{ "ng-repeat" => "error in errors", "ng-bind" => "error" }

4
app/assets/javascripts/templates/admin/panel.html.haml
View File

@@ -1,2 +1,2 @@
%td{ colspan: "{{columnCount}}", ng: { if: "template" } }
.panel{ ng: { include: "template" } }
%td{ "colspan" => "{{columnCount}}", "ng-if" => "template" }
.panel{ "ng-include" => "template" }

44
app/assets/javascripts/templates/admin/panels/enterprise_package.html.haml
View File

@@ -1,7 +1,7 @@
.row.enterprise_package_panel{ ng: { controller: 'indexPackagePanelCtrl' } }
.row.enterprise_package_panel{ "ng-controller" => 'indexPackagePanelCtrl' }
.alpha.eight.columns
%div{ ng: { if: "!enterprise.is_primary_producer", switch: "enterprise.sells" } }
.info{ ng: { switch: { when: "none" } } }
%div{ "ng-if" => "!enterprise.is_primary_producer", "ng-switch" => "enterprise.sells" }
.info{ "ng-switch-when" => "none" }
%h3
{{ 'js.admin.panels.enterprise_package.hub_profile' | t }}
@@ -15,7 +15,7 @@
%p
{{ 'js.admin.panels.enterprise_package.hub_profile_text2' | t }}
.info{ ng: { switch: { when: "any" } } }
.info{ "ng-switch-when" => "any" }
%h3
{{ 'js.admin.panels.enterprise_package.hub_shop' | t }}
@@ -28,7 +28,7 @@
%p
{{ 'js.admin.panels.enterprise_package.hub_shop_text3' | t }}
.info{ ng: { switch: { default: true } } }
.info{ "ng-switch-default" => true }
%h3
{{ 'js.admin.panels.enterprise_package.choose_package' | t }}
%i.icon-arrow-right
@@ -40,8 +40,8 @@
%p
{{ 'js.admin.panels.enterprise_package.choose_package_text2' | t }}
%div{ ng: { if: "enterprise.is_primary_producer", switch: "enterprise.sells" } }
.info{ ng: { switch: { when: "none" } } }
%div{ "ng-if" => "enterprise.is_primary_producer", "ng-switch" => "enterprise.sells" }
.info{ "ng-switch-when" => "none" }
%h3
{{ 'js.admin.panels.enterprise_package.profile_only' | t }}
@@ -58,7 +58,7 @@
%p
{{ 'js.admin.panels.enterprise_package.profile_only_text3' | t }}
.info{ ng: { switch: { when: "own" } } }
.info{ "ng-switch-when" => "own" }
%h3
{{ 'js.admin.panels.enterprise_package.producer_shop' | t }}
@@ -68,7 +68,7 @@
%p
{{ 'js.admin.panels.enterprise_package.producer_shop_text2' | t }}
.info{ ng: { switch: { when: "any" } } }
.info{ "ng-switch-when" => "any" }
%h3
{{ 'js.admin.panels.enterprise_package.producer_hub' | t }}
@@ -81,7 +81,7 @@
%p
{{ 'js.admin.panels.enterprise_package.producer_hub_text3' | t }}
.info{ ng: { switch: { default: true } } }
.info{ "ng-switch-default" => true }
%h3
{{ 'js.admin.panels.enterprise_package.choose_package' | t }}
%i.icon-arrow-right
@@ -93,9 +93,9 @@
%p
{{ 'js.admin.panels.enterprise_package.choose_package_text2' | t }}
.omega.eight.columns{ ng: { switch: "enterprise.is_primary_producer" } }
%div{ ng: { switch: { when: "false" } } }
%a.button.selector.hub-profile{ ng: { click: "enterprise.owned && (enterprise.sells='none')", class: "{selected: enterprise.sells=='none', disabled: !enterprise.owned}" } }
.omega.eight.columns{ "ng-switch" => "enterprise.is_primary_producer" }
%div{ "ng-switch-when" => "false" }
%a.button.selector.hub-profile{ "ng-click" => "enterprise.owned && (enterprise.sells='none')", "ng-class" => "{selected: enterprise.sells=='none', disabled: !enterprise.owned}" }
.top
%h3
{{ 'js.admin.panels.enterprise_package.profile_only' | t }}
@@ -103,15 +103,15 @@
{{ 'js.admin.panels.enterprise_package.get_listing' | t }}
.bottom
{{ 'js.admin.panels.enterprise_package.always_free' | t }}
%a.button.selector.hub{ ng: { click: "enterprise.owned && (enterprise.sells='any')", class: "{selected: enterprise.sells=='any', disabled: !enterprise.owned}" } }
%a.button.selector.hub{ "ng-click" => "enterprise.owned && (enterprise.sells='any')", "ng-class" => "{selected: enterprise.sells=='any', disabled: !enterprise.owned}" }
.top
%h3
{{ 'js.admin.panels.enterprise_package.hub_shop' | t }}
%p
{{ 'js.admin.panels.enterprise_package.sell_produce_others' | t }}
%div{ ng: { switch: { when: "true" } } }
%a.button.selector.producer-profile{ ng: { click: "enterprise.owned && (enterprise.sells='none')", class: "{selected: enterprise.sells=='none', disabled: !enterprise.owned}" } }
%div{ "ng-switch-when" => "true" }
%a.button.selector.producer-profile{ "ng-click" => "enterprise.owned && (enterprise.sells='none')", "ng-class" => "{selected: enterprise.sells=='none', disabled: !enterprise.owned}" }
.top
%h3
{{ 'js.admin.panels.enterprise_package.profile_only' | t }}
@@ -119,27 +119,27 @@
{{ 'js.admin.panels.enterprise_package.get_listing' | t }}
.bottom
{{ 'js.admin.panels.enterprise_package.always_free' | t }}
%a.button.selector.producer-shop{ ng: { click: "enterprise.owned && (enterprise.sells='own')", class: "{selected: enterprise.sells=='own', disabled: !enterprise.owned}" } }
%a.button.selector.producer-shop{ "ng-click" => "enterprise.owned && (enterprise.sells='own')", "ng-class" => "{selected: enterprise.sells=='own', disabled: !enterprise.owned}" }
.top
%h3
{{ 'js.admin.panels.enterprise_package.producer_shop' | t }}
%p
{{ 'js.admin.panels.enterprise_package.sell_own_produce' | t }}
%a.button.selector.producer-hub{ ng: { click: "enterprise.owned && (enterprise.sells='any')", class: "{selected: enterprise.sells=='any', disabled: !enterprise.owned}" } }
%a.button.selector.producer-hub{ "ng-click" => "enterprise.owned && (enterprise.sells='any')", "ng-class" => "{selected: enterprise.sells=='any', disabled: !enterprise.owned}" }
.top
%h3
{{ 'js.admin.panels.enterprise_package.producer_hub' | t }}
%p
{{ 'js.admin.panels.enterprise_package.sell_both' | t }}
%a.button.update.fullwidth{ ng: { show: "enterprise.owned", class: "{disabled: saved() && !saving, saving: saving}", click: "save()" } }
%span{ ng: {hide: "saved() || saving" } }
%a.button.update.fullwidth{ "ng-show" => "enterprise.owned", "ng-class" => "{disabled: saved() && !saving, saving: saving}", "ng-click" => "save()" }
%span{ "ng-hide" => "saved() || saving" }
{{ 'js.admin.panels.save' | t }}
%i.icon-save
%span{ ng: {show: "saved() && !saving" } }
%span{ "ng-show" => "saved() && !saving" }
{{ 'js.admin.panels.saved' | t }}
%i.icon-ok-sign
%span{ ng: {show: "saving" } }
%span{ "ng-show" => "saving" }
{{ 'js.admin.panels.saving' | t }}
%i.icon-refresh

18
app/assets/javascripts/templates/admin/panels/enterprise_producer.html.haml
View File

@@ -1,6 +1,6 @@
.row.enterprise_producer_panel{ ng: { controller: 'indexProducerPanelCtrl' } }
.row.enterprise_producer_panel{ "ng-controller" => 'indexProducerPanelCtrl' }
.alpha.eight.columns
.info{ ng: { show: "enterprise.is_primary_producer==true" } }
.info{ "ng-show" => "enterprise.is_primary_producer==true" }
%h3
{{ 'js.admin.panels.enterprise_producer.producer' | t }}
%p
@@ -8,7 +8,7 @@
%p
{{ 'js.admin.panels.enterprise_producer.producer_text2' | t }}
.info{ ng: { show: "enterprise.is_primary_producer==false" } }
.info{ "ng-show" => "enterprise.is_primary_producer==false" }
%h3
{{ 'js.admin.panels.enterprise_producer.non_producer' | t }}
%p
@@ -17,7 +17,7 @@
{{ 'js.admin.panels.enterprise_producer.non_producer_text2' | t }}
.omega.eight.columns
%a.button.selector.producer{ ng: { click: 'enterprise.owned && changeToProducer()', class: "{selected: enterprise.is_primary_producer==true, disabled: !enterprise.owned}" } }
%a.button.selector.producer{ "ng-click" => 'enterprise.owned && changeToProducer()', "ng-class" => "{selected: enterprise.is_primary_producer==true, disabled: !enterprise.owned}" }
.top
%h3
{{ 'js.admin.panels.enterprise_producer.producer' | t }}
@@ -26,7 +26,7 @@
.bottom
{{ 'js.admin.panels.enterprise_producer.producer_example' | t }}
%a.button.selector.non-producer{ ng: { click: 'enterprise.owned && changeToNonProducer()', class: "{selected: enterprise.is_primary_producer==false, disabled: !enterprise.owned}" } }
%a.button.selector.non-producer{ "ng-click" => 'enterprise.owned && changeToNonProducer()', "ng-class" => "{selected: enterprise.is_primary_producer==false, disabled: !enterprise.owned}" }
.top
%h3
{{ 'js.admin.panels.enterprise_producer.non_producer' | t }}
@@ -35,13 +35,13 @@
.bottom
{{ 'js.admin.panels.enterprise_producer.non_producer_example' | t }}
%a.button.update.fullwidth{ ng: { show: "enterprise.owned", class: "{disabled: saved() && !saving, saving: saving}", click: "save()" } }
%span{ ng: {hide: "saved() || saving" } }
%a.button.update.fullwidth{ "ng-show" => "enterprise.owned", "ng-class" => "{disabled: saved() && !saving, saving: saving}", "ng-click" => "save()" }
%span{ "ng-hide" => "saved() || saving" }
{{ 'js.admin.panels.save' | t }}
%i.icon-save
%span{ ng: {show: "saved() && !saving" } }
%span{ "ng-show" => "saved() && !saving" }
{{ 'js.admin.panels.saved' | t }}
%i.icon-ok-sign
%span{ ng: {show: "saving" } }
%span{ "ng-show" => "saving" }
{{ 'js.admin.panels.saving' | t }}
%i.icon-refresh

18
app/assets/javascripts/templates/admin/panels/enterprise_status.html.haml
View File

@@ -1,10 +1,10 @@
.row.enterprise_status_panel{ ng: { controller: 'indexStatusPanelCtrl' } }
.row.enterprise_status_panel{ "ng-controller" => 'indexStatusPanelCtrl' }
.alpha.omega.sixteen.columns
%h4.status-ok.text-center{ ng: { show: "issues.length == 0 && warnings.length == 0" } }
%h4.status-ok.text-center{ "ng-show" => "issues.length == 0 && warnings.length == 0" }
%i.icon-ok-sign
{{ 'js.admin.panels.enterprise_status.status_title' | t:{ name: object.name } }}
%table{ ng: { show: "issues.length > 0 || warnings.length > 0" } }
%table{ "ng-show" => "issues.length > 0 || warnings.length > 0" }
%thead
%th.severity
{{ 'js.admin.panels.enterprise_status.severity' | t }}
@@ -12,17 +12,17 @@
{{ 'js.admin.panels.enterprise_status.description' | t }}
%th.resolve
{{ 'js.admin.panels.enterprise_status.resolve' | t }}
%tr{ ng: { repeat: "issue in issues"} }
%tr{ "ng-repeat" => "issue in issues" }
%td.severity
%i.icon-warning-sign.issue
%td.description
%span{ ng: { bind: "::issue.description" } }
%span{ "ng-bind" => "::issue.description" }
%td.resolve
%div{ ng: { bind: { html: "issue.link" } } }
%tr{ ng: { repeat: "warning in warnings"} }
%div{ "ng-bind-html" => "issue.link" }
%tr{ "ng-repeat" => "warning in warnings" }
%td.severity
%i.icon-warning-sign.warning
%td.description
%span{ ng: { bind: "::warning.description" } }
%span{ "ng-bind" => "::warning.description" }
%td.resolve
%div{ ng: { bind: { html: "warning.link" } } }
%div{ "ng-bind-html" => "warning.link" }

8
app/assets/javascripts/templates/admin/save_bar.html.haml
View File

@@ -1,9 +1,9 @@
#save-bar.animate-show{ ng: { show: 'dirty || persist || StatusMessage.active()' } }
#save-bar.animate-show{ "ng-show" => 'dirty || persist || StatusMessage.active()' }
.container
.seven.columns.alpha
%h5#status-message{ ng: { show: "StatusMessage.invalidMessage == ''", style: 'StatusMessage.statusMessage.style' } }
%h5#status-message{ "ng-show" => "StatusMessage.invalidMessage == ''", "ng-style" => 'StatusMessage.statusMessage.style' }
{{ StatusMessage.statusMessage.text || " " }}
%h5#status-message{ ng: { show: "StatusMessage.invalidMessage !== ''" }, style: 'color: #C85136' }
%h5#status-message{ "style" => 'color: #C85136', "ng-show" => "StatusMessage.invalidMessage !== ''" }
{{ StatusMessage.invalidMessage || " " }}
.nine.columns.omega.text-right{ ng: { transclude: true } }
.nine.columns.omega.text-right{ "ng-transclude" => true }

22
app/assets/javascripts/templates/admin/schedule_dialog.html.haml
View File

@@ -1,24 +1,24 @@
#schedule-dialog
.text-normal.margin-bottom-30.text-center
%span{ ng: { hide: 'schedule.id' } }
%span{ "ng-hide" => 'schedule.id' }
{{ 'js.admin.order_cycles.schedules.adding_a_new_schedule' | t }}
%span{ ng: { show: 'schedule.id' } }
%span{ "ng-show" => 'schedule.id' }
{{ 'js.admin.order_cycles.schedules.updating_a_schedule' | t }}
%form{ name: 'schedule_form', novalidate: true, ng: { submit: "submit()" }}
%form{ "name" => 'schedule_form', "novalidate" => true, "ng-submit" => "submit()" }
.text-center.margin-bottom-20
%input.fullwidth{ type: 'text', name: 'name', required: true, placeholder: "{{ 'js.admin.order_cycles.schedules.schedule_name_placeholder' | t }}", ng: { model: "schedule.name" } }
%div{ ng: { show: "submitted && schedule_form.$pristine" } }
.error{ ng: { show: "(schedule_form.name.$error.required)" } }
%input.fullwidth{ "type" => 'text', "name" => 'name', "required" => true, "placeholder" => "{{ 'js.admin.order_cycles.schedules.schedule_name_placeholder' | t }}", "ng-model" => "schedule.name" }
%div{ "ng-show" => "submitted && schedule_form.$pristine" }
.error{ "ng-show" => "(schedule_form.name.$error.required)" }
{{ 'js.admin.order_cycles.schedules.name_required_error' | t }}
.order-cycles-selector.text-center.margin-bottom-30
.text-center
%input.button{ type: 'submit', value: "{{ 'js.admin.order_cycles.schedules.create_schedule' | t }}", ng: { hide: 'schedule.id' } }
%input.button{ type: 'submit', value: "{{ 'js.admin.order_cycles.schedules.update_schedule' | t }}", ng: { show: 'schedule.id' } }
%span{ ng: { show: 'schedule.id' } } or
%input.button.red{ type: 'button', value: "{{ 'js.admin.order_cycles.schedules.delete_schedule' | t }}", ng: { show: 'schedule.id', click: 'delete()'} }
%input.button{ type: 'button', value: "{{ 'actions.cancel' | t }}", ng: { click: 'close()' } }
%input.button{ "type" => 'submit', "value" => "{{ 'js.admin.order_cycles.schedules.create_schedule' | t }}", "ng-hide" => 'schedule.id' }
%input.button{ "type" => 'submit', "value" => "{{ 'js.admin.order_cycles.schedules.update_schedule' | t }}", "ng-show" => 'schedule.id' }
%span{ "ng-show" => 'schedule.id' } or
%input.button.red{ "type" => 'button', "value" => "{{ 'js.admin.order_cycles.schedules.delete_schedule' | t }}", "ng-show" => 'schedule.id', "ng-click" => 'delete()' }
%input.button{ "type" => 'button', "value" => "{{ 'actions.cancel' | t }}", "ng-click" => 'close()' }

6
app/assets/javascripts/templates/admin/tag.html.haml
View File

@@ -1,8 +1,8 @@
.tag-template
%div
%span.tag-with-rules{ ng: { if: "data.rules" }, "ofn-with-tip" => "{{ 'admin.tag_has_rules' | t:{num: data.rules} }}" }
%span.tag-with-rules{ "ofn-with-tip" => "{{ 'admin.tag_has_rules' | t:{num: data.rules} }}", "ng-if" => "data.rules" }
{{$getDisplayText()}}
%span{ ng: { if: "!data.rules" } }
%span{ "ng-if" => "!data.rules" }
{{$getDisplayText()}}
%a.remove-button{ ng: {click: "$removeTag()"} }
%a.remove-button{ "ng-click" => "$removeTag()" }
✖

8
app/assets/javascripts/templates/admin/tag_autocomplete.html.haml
View File

@@ -1,11 +1,11 @@
.autocomplete-template
%span.tag-with-rules{ ng: { if: "data.rules" } }
%span.tag-with-rules{ "ng-if" => "data.rules" }
{{$getDisplayText()}}
%span.tag-with-rules{ ng: { if: "data.rules == 1" } }
%span.tag-with-rules{ "ng-if" => "data.rules == 1" }
—
{{ 'admin.has_one_rule' | t }}
%span.tag-with-rules{ ng: { if: "data.rules > 1" } }
%span.tag-with-rules{ "ng-if" => "data.rules > 1" }
—
{{ 'admin.has_n_rules' | t:{ num: data.rules } }}
%span{ ng: { if: "!data.rules" } }
%span{ "ng-if" => "!data.rules" }
{{$getDisplayText()}}

6
app/assets/javascripts/templates/admin/tag_rules/discount_order_input.html.haml
View File

@@ -1,7 +1,3 @@
%div
%input{ type: "number",
id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_calculator_attributes_preferred_flat_percent",
min: -100,
max: 100,
ng: { model: "rule.calculator.preferred_flat_percent" }, 'invert-number' => true }
%input{ "type" => "number", "id" => "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_calculator_attributes_preferred_flat_percent", "min" => -100, "max" => 100, "invert-number" => true, "ng-model" => "rule.calculator.preferred_flat_percent" }
%span.text-normal %

12
app/assets/javascripts/templates/admin/tag_rules/filter_order_cycles_input.html.haml
View File

@@ -1,11 +1,5 @@
%div
%input.fullwidth.light.ofn-select2{ id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_order_cycles_visibility",
name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_order_cycles_visibility]",
ng: { model: "rule.preferred_matched_order_cycles_visibility", if: "!rule.is_default" },
data: 'visibilityOptions', "min-search" => 5 }
%input{ type: "hidden",
id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_order_cycles_visibility",
name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_order_cycles_visibility]",
ng: { value: "'hidden'", if: "rule.is_default" } }
%span.text-normal{ ng: { if: "rule.is_default" } }
%input.fullwidth.light.ofn-select2{ "id" => "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_order_cycles_visibility", "name" => "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_order_cycles_visibility]", "data" => 'visibilityOptions', "min-search" => 5, "ng-model" => "rule.preferred_matched_order_cycles_visibility", "ng-if" => "!rule.is_default" }
%input{ "type" => "hidden", "id" => "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_order_cycles_visibility", "name" => "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_order_cycles_visibility]", "ng-value" => "'hidden'", "ng-if" => "rule.is_default" }
%span.text-normal{ "ng-if" => "rule.is_default" }
=t(:not_visible)

12
app/assets/javascripts/templates/admin/tag_rules/filter_payment_methods_input.html.haml
View File

@@ -1,11 +1,5 @@
%div
%input.fullwidth.light.ofn-select2{ id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_payment_methods_visibility",
name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_payment_methods_visibility]",
ng: { model: "rule.preferred_matched_payment_methods_visibility", if: "!rule.is_default" },
data: 'visibilityOptions', "min-search" => 5 }
%input{ type: "hidden",
id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_payment_methods_visibility",
name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_payment_methods_visibility]",
ng: { value: "'hidden'", if: "rule.is_default" } }
%span.text-normal{ ng: { if: "rule.is_default" } }
%input.fullwidth.light.ofn-select2{ "id" => "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_payment_methods_visibility", "name" => "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_payment_methods_visibility]", "data" => 'visibilityOptions', "min-search" => 5, "ng-model" => "rule.preferred_matched_payment_methods_visibility", "ng-if" => "!rule.is_default" }
%input{ "type" => "hidden", "id" => "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_payment_methods_visibility", "name" => "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_payment_methods_visibility]", "ng-value" => "'hidden'", "ng-if" => "rule.is_default" }
%span.text-normal{ "ng-if" => "rule.is_default" }
= t(:not_visible)

12
app/assets/javascripts/templates/admin/tag_rules/filter_products_input.html.haml
View File

@@ -1,11 +1,5 @@
%div
%input.fullwidth.light.ofn-select2{ id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_variants_visibility",
name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_variants_visibility]",
ng: { model: "rule.preferred_matched_variants_visibility", if: "!rule.is_default" },
data: 'visibilityOptions', "min-search" => 5 }
%input{ type: "hidden",
id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_variants_visibility",
name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_variants_visibility]",
ng: { value: "'hidden'", if: "rule.is_default" } }
%span.text-normal{ ng: { if: "rule.is_default" } }
%input.fullwidth.light.ofn-select2{ "id" => "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_variants_visibility", "name" => "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_variants_visibility]", "data" => 'visibilityOptions', "min-search" => 5, "ng-model" => "rule.preferred_matched_variants_visibility", "ng-if" => "!rule.is_default" }
%input{ "type" => "hidden", "id" => "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_variants_visibility", "name" => "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_variants_visibility]", "ng-value" => "'hidden'", "ng-if" => "rule.is_default" }
%span.text-normal{ "ng-if" => "rule.is_default" }
= t(:not_visible)

12
app/assets/javascripts/templates/admin/tag_rules/filter_shipping_methods_input.html.haml
View File

@@ -1,12 +1,6 @@
%div
%input.fullwidth.light.ofn-select2{ id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_shipping_methods_visibility",
name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_shipping_methods_visibility]",
ng: { model: "rule.preferred_matched_shipping_methods_visibility", if: "!rule.is_default" },
data: 'visibilityOptions', "min-search" => 5 }
%input{ type: "hidden",
id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_shipping_methods_visibility",
name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_shipping_methods_visibility]",
ng: { value: "'hidden'", if: "rule.is_default" } }
%span.text-normal{ ng: { if: "rule.is_default" } }
%input.fullwidth.light.ofn-select2{ "id" => "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_shipping_methods_visibility", "name" => "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_shipping_methods_visibility]", "data" => 'visibilityOptions', "min-search" => 5, "ng-model" => "rule.preferred_matched_shipping_methods_visibility", "ng-if" => "!rule.is_default" }
%input{ "type" => "hidden", "id" => "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_matched_shipping_methods_visibility", "name" => "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_matched_shipping_methods_visibility]", "ng-value" => "'hidden'", "ng-if" => "rule.is_default" }
%span.text-normal{ "ng-if" => "rule.is_default" }
= t(:not_visible)

34
app/assets/javascripts/templates/admin/tag_rules/tag_rule.html.haml
View File

@@ -6,45 +6,27 @@
%col.actions{ width: "10%" }
%tr
%td
%input{ type: "hidden",
id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_id",
name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][id]",
ng: { value: "rule.id" } }
%input{ "type" => "hidden", "id" => "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_id", "name" => "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][id]", "ng-value" => "rule.id" }
%input{ type: "hidden",
id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_type",
name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][type]",
ng: { value: "rule.type" } }
%input{ "type" => "hidden", "id" => "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_type", "name" => "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][type]", "ng-value" => "rule.type" }
%input{ type: "hidden",
id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_priority",
name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][priority]",
ng: { value: "tagGroup.startIndex + $index" } }
%input{ "type" => "hidden", "id" => "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_priority", "name" => "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][priority]", "ng-value" => "tagGroup.startIndex + $index" }
%input{ type: "hidden",
id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_is_default",
name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][is_default]",
ng: { value: "rule.is_default" } }
%input{ "type" => "hidden", "id" => "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_is_default", "name" => "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][is_default]", "ng-value" => "rule.is_default" }
%input{ type: "hidden",
id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_customer_tags",
name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_customer_tags]",
ng: { value: "rule.preferred_customer_tags" } }
%input{ "type" => "hidden", "id" => "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_customer_tags", "name" => "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_customer_tags]", "ng-value" => "rule.preferred_customer_tags" }
%input{ type: "hidden",
id: "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_{{opt[rule.type].taggable}}_tags",
name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_{{opt[rule.type].taggable}}_tags]",
ng: { value: "opt[rule.type].tagListFor(rule)" } }
%input{ "type" => "hidden", "id" => "enterprise_tag_rules_attributes_{{tagGroup.startIndex + $index}}_preferred_{{opt[rule.type].taggable}}_tags", "name" => "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_{{opt[rule.type].taggable}}_tags]", "ng-value" => "opt[rule.type].tagListFor(rule)" }
%span.text-normal {{ opt[rule.type].textTop }}
%td
%tags-with-translation{ object: "rule", max: 1, "tags-attr" => "{{opt[rule.type].tagsAttr}}", "tag-list-attr" => "{{opt[rule.type].tagListAttr}}" }
%td.actions{ rowspan: 2 }
%a{ ng: { click: "deleteTagRule(tagGroup || defaultTagGroup, rule)" }, :class => "delete-tag-rule icon-trash no-text" }
%a{ "class" => "delete-tag-rule icon-trash no-text", "ng-click" => "deleteTagRule(tagGroup || defaultTagGroup, rule)" }
%tr
%td
%span.text-normal {{ opt[rule.type].textBottom }}
%td
%div{ ng: { include: "opt[rule.type].inputTemplate"} }
%div{ "ng-include" => "opt[rule.type].inputTemplate" }
%hr

12
app/assets/javascripts/templates/admin/tags_input.html.haml
View File

@@ -1,10 +1,2 @@
%tags-input{ template: 'admin/tag.html',
"placeholder" => t('admin.order_cycles.form.add_a_tag'),
ng: { model: 'object[tagsAttr]', class: "{'limit-reached': limitReached}"},
on: { tag: { added: 'tagAdded($tag)', removed:'tagRemoved()' } } }
%auto-complete{ ng: { if: "findTags" }, source: "findTags({query: $query})",
template: "admin/tag_autocomplete.html",
"min-length" => "0",
"load-on-focus" => "true",
"load-on-empty" => "true",
"max-results-to-show" => "32"}
%tags-input{ "template" => 'admin/tag.html', "placeholder" => t('admin.order_cycles.form.add_a_tag'), "ng-model" => 'object[tagsAttr]', "ng-class" => "{'limit-reached': limitReached}", "on-tag-added" => 'tagAdded($tag)', "on-tag-removed" => 'tagRemoved()' }
%auto-complete{ "source" => "findTags({query: $query})", "template" => "admin/tag_autocomplete.html", "min-length" => "0", "load-on-focus" => "true", "load-on-empty" => "true", "max-results-to-show" => "32", "ng-if" => "findTags" }

14
app/assets/javascripts/templates/bulk_buy_modal.html.haml
View File

@@ -22,24 +22,22 @@
.variant-bulk-buy-quantity-label
{{ "js.shopfront.bulk_buy_modal.min_quantity" | t }}
%div
%button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "add(-1)", disabled: "!canAdd(-1)"}}>
%button.bulk-buy-add.variant-quantity{ "type" => "button", "ng-click" => "add(-1)", "ng-disabled" => "!canAdd(-1)" }>
-# U+FF0D Fullwidth Hyphen-Minus
－
%input.bulk-buy.variant-quantity{type: "number", min: "0", max: "{{ available() }}",
ng: {model: "variant.line_item.quantity", max: "Infinity"}}>
%button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "add(1)", disabled: "!canAdd(1)"}}
%input.bulk-buy.variant-quantity{ "type" => "number", "min" => "0", "max" => "{{ available() }}", "ng-model" => "variant.line_item.quantity", "ng-max" => "Infinity" }>
%button.bulk-buy-add.variant-quantity{ "type" => "button", "ng-click" => "add(1)", "ng-disabled" => "!canAdd(1)" }
-# U+FF0B Fullwidth Plus Sign
＋
.columns.small-12.medium-6
.variant-bulk-buy-quantity-label
{{ "js.shopfront.bulk_buy_modal.max_quantity" | t }}
%div
%button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "addMax(-1)", disabled: "!canAddMax(-1)"}}>
%button.bulk-buy-add.variant-quantity{ "type" => "button", "ng-click" => "addMax(-1)", "ng-disabled" => "!canAddMax(-1)" }>
-# U+FF0D Fullwidth Hyphen-Minus
－
%input.bulk-buy.variant-quantity{type: "number", min: "0", max: "{{ available() }}",
ng: {model: "variant.line_item.max_quantity", max: "Infinity"}}>
%button.bulk-buy-add.variant-quantity{type: "button", ng: {click: "addMax(1)", disabled: "!canAddMax(1)"}}
%input.bulk-buy.variant-quantity{ "type" => "number", "min" => "0", "max" => "{{ available() }}", "ng-model" => "variant.line_item.max_quantity", "ng-max" => "Infinity" }>
%button.bulk-buy-add.variant-quantity{ "type" => "button", "ng-click" => "addMax(1)", "ng-disabled" => "!canAddMax(1)" }
-# U+FF0B Fullwidth Plus Sign
＋

2
app/assets/javascripts/templates/filter_selector.html.haml
View File

@@ -1,3 +1,3 @@
%ul
%active-selector{ ng: { repeat: "selector in allSelectors", show: "ifDefined(selector.fits, true)" } }
%active-selector{ "ng-repeat" => "selector in allSelectors", "ng-show" => "ifDefined(selector.fits, true)" }
%span{"ng-bind" => "::selector.object.name"}

2
app/assets/javascripts/templates/help-modal.html.haml
View File

@@ -5,5 +5,5 @@
.small-12.columns.text-center
{{ helpText }}
.row.text-center
%button.primary.small{ ng: { click: '$close()' } }
%button.primary.small{ "ng-click" => '$close()' }
= t(:ok)

2
app/assets/javascripts/templates/partials/hub_details.html.haml
View File

@@ -1,4 +1,4 @@
.row.pad-top{ng: { if: 'enterprise.is_distributor' } }
.row.pad-top{ "ng-if" => 'enterprise.is_distributor' }
.cta-container.small-12.columns
.row
.small-4.columns

4
app/assets/javascripts/templates/price_breakdown.html.haml
View File

@@ -1,6 +1,6 @@
.joyride-tip-guide.price_breakdown{ng: {class: "{ in: tt_isOpen, fade: tt_animation }", show: "tt_isOpen"}}
.joyride-tip-guide.price_breakdown{ "ng-class" => "{ in: tt_isOpen, fade: tt_animation }", "ng-show" => "tt_isOpen" }
%span.joyride-nub.top
.background{ng: {click: "tt_isOpen = false"}}
.background{ "ng-click" => "tt_isOpen = false" }
.joyride-content-wrapper
%h6 {{ "js.shopfront.price_breakdown" | t }}
%ul

4
app/assets/javascripts/templates/shared/question_mark_with_tooltip.html.haml
View File

@@ -1,5 +1,5 @@
.joyride-tip-guide.question-mark-tooltip{class: "{{ context }}", ng: {class: "{ in: tt_isOpen, fade: tt_animation }", show: "tt_isOpen"}}
.background{ng: {click: "tt_isOpen = false"}}
.joyride-tip-guide.question-mark-tooltip{ "class" => "{{ context }}", "ng-class" => "{ in: tt_isOpen, fade: tt_animation }", "ng-show" => "tt_isOpen" }
.background{ "ng-click" => "tt_isOpen = false" }
.joyride-content-wrapper
{{ key | t }}
%span.joyride-nub.bottom

2
app/components/multiple_checked_select_component/multiple_checked_select_component.html.haml
View File

@@ -1,4 +1,4 @@
.ofn-drop-down.ofn-drop-down-v2{ data: { controller: "multiple-checked-select" } }
.ofn-drop-down.ofn-drop-down-v2{ "data-controller" => "multiple-checked-select" }
%div.ofn-drop-down-label{ "data-multiple-checked-select-target": "button" }
%span{class: "label"}= t('admin.columns')
%span{ class: "icon-caret-down", "data-multiple-checked-select-target": "caret" }

2
app/views/admin/_terms_of_service_banner.html.haml
View File

@@ -3,6 +3,6 @@
.column-left
%p= t("admin.terms_of_service_have_been_updated_html", tos_link: link_to(t("admin.terms_of_service"), TermsOfServiceFile.current_url, target: "_blank"))
.column-right
%button{ data: { reflex: "click->user#accept_terms_of_services" } }
%button{ "data-reflex" => "click->user#accept_terms_of_services" }
= t("admin.accept_terms_of_service")

34
app/views/admin/customers/index.html.haml
View File

@@ -14,22 +14,22 @@
= admin_inject_shops(@shops, module: 'admin.customers')
= admin_inject_available_countries(module: 'admin.customers')
%div{ ng: { controller: 'customersCtrl' } }
%div{ "ng-controller" => 'customersCtrl' }
.row.filters
.sixteen.columns.alpha.omega
.filter_select.five.columns.alpha
%label{ :for => 'quick_search', ng: {class: '{disabled: !shop_id}'} }=t('admin.quick_search')
%label{ "for" => 'quick_search', "ng-class" => '{disabled: !shop_id}' }=t('admin.quick_search')
%br
%input.fullwidth{ :type => "text", :id => 'quick_search', ng: { model: 'quickSearch', disabled: '!shop_id' }, :placeholder => t('.search_by_email') }
%input.fullwidth{ "type" => "text", "id" => 'quick_search', "placeholder" => t('.search_by_email'), "ng-model" => 'quickSearch', "ng-disabled" => '!shop_id' }
.filter_select.four.columns
%label{ :for => 'hub_id', ng: { bind: "shop_id ? '#{t('admin.shop')}' : '#{t('admin.variant_overrides.index.select_a_shop')}'" } }
%label{ "for" => 'hub_id', "ng-bind" => "shop_id ? '#{t('admin.shop')}' : '#{t('admin.variant_overrides.index.select_a_shop')}'" }
%br
%input.ofn-select2.fullwidth#shop_id{ 'ng-model' => 'shop_id', name: 'shop_id', data: 'shops', on: { selecting: 'confirmRefresh' } }
%input.ofn-select2.fullwidth#shop_id{ "ng-model" => 'shop_id', "name" => 'shop_id', "data" => 'shops', "on-selecting" => 'confirmRefresh' }
.seven.columns.omega  
%hr.divider{ ng: { show: "!RequestMonitor.loading && filteredCustomers.length > 0" } }
%hr.divider{ "ng-show" => "!RequestMonitor.loading && filteredCustomers.length > 0" }
.row.controls{ ng: { show: "!RequestMonitor.loading && filteredCustomers.length > 0" } }
.row.controls{ "ng-show" => "!RequestMonitor.loading && filteredCustomers.length > 0" }
.thirteen.columns.alpha  
%columns-dropdown{ action: "#{controller_name}_#{action_name}" }
@@ -39,13 +39,13 @@
%h1
= t :loading_customers
.row.margin-bottom-50{ ng: { show: "!RequestMonitor.loading" } }
.row.margin-bottom-50{ "ng-show" => "!RequestMonitor.loading" }
%form{ name: "customers_form" }
%h1#no_results{ 'ng-show' => '!RequestMonitor.loading && filteredCustomers.length == 0' }
=t :no_customers_found
%save-bar{ dirty: "customers_form.$dirty", persist: "false" }
%input.red{ type: "button", value: t(:save_changes), ng: { click: "submitAll(customers_form)" } }
%input.red{ "type" => "button", "value" => t(:save_changes), "ng-click" => "submitAll(customers_form)" }
%table.index#customers{ 'ng-show' => '!RequestMonitor.loading && filteredCustomers.length > 0' }
%col.email{ width: "20%", 'ng-show' => 'columns.email.visible' }
@@ -58,7 +58,7 @@
%col.balance{ width: "10%", 'ng-show' => 'columns.balance.visible' }
%col.actions{ width: "10%"}
%thead
%tr{ ng: { controller: "ColumnsCtrl" } }
%tr{ "ng-controller" => "ColumnsCtrl" }
-# %th.bulk
-# %input{ :type => "checkbox", :name => 'toggle_bulk', 'ng-click' => 'toggleAllCheckboxes()', 'ng-checked' => "allBoxesChecked()" }
%th.email{ 'ng-show' => 'columns.email.visible' }
@@ -81,12 +81,12 @@
%span{ 'ng-bind' => '::customer.email' }
%span.guest-label{ 'ng-show' => 'customer.user_id == null' }= t('.guest_label')
%td.first_name{ 'ng-show' => 'columns.first_name.visible'}
%input{ type: 'text', name: 'first_name', ng: { model: 'customer.first_name' }, 'obj-for-update' => 'customer', 'attr-for-update' => 'first_name'}
%input{ "type" => 'text', "name" => 'first_name', "obj-for-update" => 'customer', "attr-for-update" => 'first_name', "ng-model" => 'customer.first_name' }
%td.last_name{ 'ng-show' => 'columns.last_name.visible'}
%input{ type: 'text', name: 'last_name', ng: { model: 'customer.last_name' }, 'obj-for-update' => 'customer', 'attr-for-update' => 'last_name'}
%input{ "type" => 'text', "name" => 'last_name', "obj-for-update" => 'customer', "attr-for-update" => 'last_name', "ng-model" => 'customer.last_name' }
%td.code{ 'ng-show' => 'columns.code.visible' }
%input{ type: 'text', name: 'code', ng: {model: 'customer.code', change: 'checkForDuplicateCodes()'}, "obj-for-update" => "customer", "attr-for-update" => "code" }
%i.icon-warning-sign{ ng: {if: 'duplicate'} }
%input{ "type" => 'text', "name" => 'code', "obj-for-update" => "customer", "attr-for-update" => "code", "ng-model" => 'customer.code', "ng-change" => 'checkForDuplicateCodes()' }
%i.icon-warning-sign{ "ng-if" => 'duplicate' }
= t('.duplicate_code')
%td.tags{ 'ng-show' => 'columns.tags.visible' }
.tag_watcher{ 'obj-for-update' => "customer", "attr-for-update" => "tag_list"}
@@ -101,6 +101,6 @@
%td.actions
%a{ 'ng-click' => "deleteCustomer(customer)", :class => "delete-customer icon-trash no-text" }
%div.text-center{ ng: { show: "filteredCustomers.length > customerLimit" } }
%input{ type: 'button', value: t(:show_more), ng: { click: 'customerLimit = customerLimit + 20' } }
%input{ type: 'button', value: t(:show_all_with_more, num: '{{ filteredCustomers.length - customerLimit }}'), ng: { click: 'customerLimit = filteredCustomers.length' } }
%div.text-center{ "ng-show" => "filteredCustomers.length > customerLimit" }
%input{ "type" => 'button', "value" => t(:show_more), "ng-click" => 'customerLimit = customerLimit + 20' }
%input{ "type" => 'button', "value" => t(:show_all_with_more, num: '{{ filteredCustomers.length - customerLimit }}'), "ng-click" => 'customerLimit = filteredCustomers.length' }

14
app/views/admin/enterprise_fees/index.html.haml
View File

@@ -29,20 +29,20 @@
%th.actions
%tbody
= enterprise_fee_set_form.ng_fields_for :collection do |f|
%tr{ ng: { repeat: 'enterprise_fee in enterprise_fees | filter:query' } }
%tr{ "ng-repeat" => 'enterprise_fee in enterprise_fees | filter:query' }
%td
= f.ng_hidden_field :id
%ofn-select{ :id => angular_id(:enterprise_id), data: 'enterprises', ng: { model: 'enterprise_fee.enterprise_id' }, style: "width: 90%" }
%input{ type: "hidden", name: angular_name(:enterprise_id), ng: { value: "enterprise_fee.enterprise_id" } }
%ofn-select{ "id" => angular_id(:enterprise_id), "data" => 'enterprises', "style" => "width: 90%", "ng-model" => 'enterprise_fee.enterprise_id' }
%input{ "type" => "hidden", "name" => angular_name(:enterprise_id), "ng-value" => "enterprise_fee.enterprise_id" }
%td= f.ng_select :fee_type, enterprise_fee_type_options, 'enterprise_fee.fee_type'
%td= f.ng_text_field :name, { placeholder: t('.name_placeholder') }
%td
%ofn-select{ :id => angular_id(:tax_category_id), data: 'tax_categories', include_blank: true, ng: { model: 'enterprise_fee.tax_category_id' } }
%ofn-select{ "id" => angular_id(:tax_category_id), "data" => 'tax_categories', "include_blank" => true, "ng-model" => 'enterprise_fee.tax_category_id' }
%input{ type: "hidden", name: angular_name(:tax_category_id), 'watch-tax-category' => true }
%input{ type: "hidden", name: angular_name(:inherits_tax_category), ng: { value: "enterprise_fee.inherits_tax_category" } }
%input{ "type" => "hidden", "name" => angular_name(:inherits_tax_category), "ng-value" => "enterprise_fee.inherits_tax_category" }
%td
%ofn-select.calculator_type{ :id => angular_id(:calculator_type), ng: { model: 'enterprise_fee.calculator_type' }, value_attr: 'name', text_attr: 'description', data: 'calculators', 'spree-ensure-calculator-preferences-match-type' => true }
%input{ type: "hidden", name: angular_name(:calculator_type), ng: { value: "enterprise_fee.calculator_type" } }
%ofn-select.calculator_type{ "id" => angular_id(:calculator_type), "value_attr" => 'name', "text_attr" => 'description', "data" => 'calculators', "spree-ensure-calculator-preferences-match-type" => true, "ng-model" => 'enterprise_fee.calculator_type' }
%input{ "type" => "hidden", "name" => angular_name(:calculator_type), "ng-value" => "enterprise_fee.calculator_type" }
%td{'ng-bind-html-unsafe-compiled' => 'enterprise_fee.calculator_settings'}
%td.actions{'spree-delete-resource' => "1"}

2
app/views/admin/enterprise_groups/_form.html.haml
View File

@@ -1,7 +1,7 @@
= render 'spree/shared/error_messages', target: @enterprise
= form_for [main_app, :admin, @enterprise_group] do |f|
.row{ ng: {app: 'admin.enterprise_groups', controller: 'enterpriseGroupCtrl'}, data: { controller: 'tabs-and-panels', "tabs-and-panels-class-name-value": "selected" } }
.row{ "ng-app" => 'admin.enterprise_groups', "ng-controller" => 'enterpriseGroupCtrl', "data-controller" => 'tabs-and-panels', "data-tabs-and-panels-class-name-value" => "selected" }
.sixteen.columns.alpha
.four.columns.alpha
= render 'admin/shared/side_menu'

2
app/views/admin/enterprise_groups/_form_about.html.haml
View File

@@ -1,4 +1,4 @@
%fieldset.alpha.no-border-bottom#about_panel{ data: { "tabs-and-panels-target": "panel" } }
%fieldset.alpha.no-border-bottom#about_panel{ "data-tabs-and-panels-target" => "panel" }
%legend= t('.about')
= f.field_container :long_description do
%text-angular{'id' => 'enterprise_group_long_description', 'name' => 'enterprise_group[long_description]', 'class' => 'text-angular', "textangular-links-target-blank" => true,

2
app/views/admin/enterprise_groups/_form_address.html.haml
View File

@@ -1,5 +1,5 @@
= f.fields_for :address do |af|
%fieldset.alpha.no-border-bottom#contact_panel{ data: { "tabs-and-panels-target": "panel" } }
%fieldset.alpha.no-border-bottom#contact_panel{ "data-tabs-and-panels-target" => "panel" }
%legend= t('.contact')
.row
.alpha.three.columns

2
app/views/admin/enterprise_groups/_form_images.html.haml
View File

@@ -1,4 +1,4 @@
%fieldset.alpha.no-border-bottom#images_panel{ data: { "tabs-and-panels-target": "panel" } }
%fieldset.alpha.no-border-bottom#images_panel{ "data-tabs-and-panels-target" => "panel" }
%legend= t('.images')
.row
.alpha.three.columns

2
app/views/admin/enterprise_groups/_form_primary_details.html.haml
View File

@@ -1,4 +1,4 @@
%fieldset.alpha.no-border-bottom#primary_details_panel{ data: { "tabs-and-panels-target": "panel default" } }
%fieldset.alpha.no-border-bottom#primary_details_panel{ "data-tabs-and-panels-target" => "panel default" }
%legend= t('.primary_details')
= f.field_container :name do
= f.label :name

2
app/views/admin/enterprise_groups/_form_users.html.haml
View File

@@ -1,4 +1,4 @@
%fieldset.alpha.no-border-bottom#users_panel{ data: { "tabs-and-panels-target": "panel" } }
%fieldset.alpha.no-border-bottom#users_panel{ "data-tabs-and-panels-target" => "panel" }
%legend= t('.users')
.row
.three.columns.alpha

2
app/views/admin/enterprise_groups/_form_web.html.haml
View File

@@ -1,4 +1,4 @@
%fieldset.alpha.no-border-bottom#web_panel{ data: { "tabs-and-panels-target": "panel" } }
%fieldset.alpha.no-border-bottom#web_panel{ "data-tabs-and-panels-target" => "panel" }
%legend= t('.web')
.row
.alpha.three.columns

2
app/views/admin/enterprise_relationships/_form.html.haml
View File

@@ -8,7 +8,7 @@
%select.select2.fullwidth{id: "enterprise_relationship_child_id", "ng-model" => "child_id", "ng-options" => "e.id as e.name for e in Enterprises.all_enterprises"}
%td
%label
%input{type: "checkbox", ng: {checked: "allPermissionsChecked()", click: "checkAllPermissions()"}}
%input{ "type" => "checkbox", "ng-checked" => "allPermissionsChecked()", "ng-click" => "checkAllPermissions()" }
= t 'admin_enterprise_relationships_everything'
%div{"ng-repeat" => "permission in EnterpriseRelationships.all_permissions"}
%label

4
app/views/admin/enterprise_relationships/_search_input.html.haml
View File

@@ -1,5 +1,5 @@
%input.search{"ng-model" => "query", "placeholder" => t(:admin_enterprise_relationships_seach_placeholder)}
%label{ng: {repeat: "permission in EnterpriseRelationships.all_permissions"}}
%input{type: "checkbox", ng: {click: "$parent.query = toggleKeyword($parent.query, permission)"}}
%label{ "ng-repeat" => "permission in EnterpriseRelationships.all_permissions" }
%input{ "type" => "checkbox", "ng-click" => "$parent.query = toggleKeyword($parent.query, permission)" }
{{ EnterpriseRelationships.permission_presentation(permission) }}

18
app/views/admin/enterprises/_change_type_form.html.haml
View File

@@ -3,13 +3,13 @@
= form_for @enterprise, url: main_app.register_admin_enterprise_path(@enterprise),
html: { name: "change_type", id: "change_type", novalidate: true, "ng-app" => "admin.enterprises", "ng-controller"=> 'changeTypeFormCtrl' } do |change_type_form|
-# Have to use hidden:'true' on this input rather than type:'hidden' as the latter seems to break ngPattern and therefore validation
%input{ hidden: "true", name: "sells", ng: { required: true, pattern: "/^(none|own|any)$/", model: 'sells', value: "sells"} }
%input{ "hidden" => "true", "name" => "sells", "ng-required" => true, "ng-pattern" => "/^(none|own|any)$/", "ng-model" => 'sells', "ng-value" => "sells" }
.row
.options.container
- if @enterprise.is_primary_producer
.basic_producer.option.six.columns.alpha
%a.full-width.button.selector{ ng: { click: "sells='none'", class: "{selected: sells=='none'}" } }
%a.full-width.button.selector{ "ng-click" => "sells='none'", "ng-class" => "{selected: sells=='none'}" }
.top
%h3= t('.producer_profile')
%p= t('.connect_ofn')
@@ -18,7 +18,7 @@
= t('.producer_description_text')
.producer_shop.option.six.columns
%a.full-width.button.selector{ ng: { click: "sells='own'", class: "{selected: sells=='own'}" } }
%a.full-width.button.selector{ "ng-click" => "sells='own'", "ng-class" => "{selected: sells=='own'}" }
.top
%h3= t('.producer_shop')
%p= t('.sell_your_produce')
@@ -29,7 +29,7 @@
= t('.producer_shop_description_text2')
.full_hub.option.six.columns.omega
%a.full-width.button.selector{ ng: { click: "sells='any'", class: "{selected: sells=='any'}" } }
%a.full-width.button.selector{ "ng-click" => "sells='any'", "ng-class" => "{selected: sells=='any'}" }
.top
%h3= t('.producer_hub')
%p= t('.producer_hub_text')
@@ -40,7 +40,7 @@
.two.columns.alpha
 
.shop_profile.option.six.columns
%a.full-width.button.selector{ ng: { click: "sells='none'", class: "{selected: sells=='none'}" } }
%a.full-width.button.selector{ "ng-click" => "sells='none'", "ng-class" => "{selected: sells=='none'}" }
.top
%h3= t('.profile')
%p= t('.get_listing')
@@ -49,7 +49,7 @@
= t('.profile_description_text')
.full_hub.option.six.columns
%a.full-width.button.selector{ ng: { click: "sells='any'", class: "{selected: sells=='any'}" } }
%a.full-width.button.selector{ "ng-click" => "sells='any'", "ng-class" => "{selected: sells=='any'}" }
.top
%h3= t('.hub_shop')
%p= t('.hub_shop_text')
@@ -60,11 +60,11 @@
.row
.sixteen.columns.alpha
%span.error{ ng: { show: "(change_type.sells.$error.required || change_type.sells.$error.pattern) && submitted" } }
%span.error{ "ng-show" => "(change_type.sells.$error.required || change_type.sells.$error.pattern) && submitted" }
= t('.choose_option')
- if @enterprise.sells == 'unspecified'
%input.button.big{ type: 'submit', value: t(:select_continue), ng: { click: "submit(change_type)" } }
%input.button.big{ "type" => 'submit', "value" => t(:select_continue), "ng-click" => "submit(change_type)" }
- else
%input.button.big{ type: 'submit', value: t('.change_now'), ng: { click: "submit(change_type)" } }
%input.button.big{ "type" => 'submit', "value" => t('.change_now'), "ng-click" => "submit(change_type)" }
%br  
%hr

50
app/views/admin/enterprises/_enterprise_user_index.html.haml
View File

@@ -1,4 +1,4 @@
%div{ ng: { controller: 'enterprisesCtrl' } }
%div{ "ng-controller" => 'enterprisesCtrl' }
.row{ 'ng-hide' => '!loaded' }
.controls{ :class => "sixteen columns alpha", :style => "margin-bottom: 15px;" }
.four.columns.alpha
@@ -15,32 +15,32 @@
.row{ :class => "sixteen columns alpha", 'ng-show' => 'loaded && filteredEnterprises.length == 0'}
%h1#no_results= t('.no_enterprises_found')
.row{ ng: { show: "loaded && filteredEnterprises.length > 0" } }
.row{ "ng-show" => "loaded && filteredEnterprises.length > 0" }
%table.index#enterprises
%col.name{ width: "28%", ng: { show: 'columns.name.visible' } }
%col.producer{ width: "18%", ng: { show: 'columns.producer.visible' }}
%col.package{ width: "18%", ng: { show: 'columns.package.visible' }}
%col.status{ width: "18%", ng: { show: 'columns.status.visible' }}
%col.manage{ width: "18%", ng: { show: 'columns.manage.visible' }}
%col.name{ "width" => "28%", "ng-show" => 'columns.name.visible' }
%col.producer{ "width" => "18%", "ng-show" => 'columns.producer.visible' }
%col.package{ "width" => "18%", "ng-show" => 'columns.package.visible' }
%col.status{ "width" => "18%", "ng-show" => 'columns.status.visible' }
%col.manage{ "width" => "18%", "ng-show" => 'columns.manage.visible' }
%thead
%tr{ ng: { controller: "ColumnsCtrl" } }
%th.name{ ng: { show: 'columns.name.visible' } }=t('admin.name')
%th.producer{ ng: { show: 'columns.producer.visible' } }=t('.producer?')
%th.package{ ng: { show: 'columns.package.visible' } }=t('.package')
%th.status{ ng: { show: 'columns.status.visible' } }=t('.status')
%th.manage{ ng: { show: 'columns.manage.visible' } }=t('.manage')
%tbody.panel-ctrl{ :id => "e_{{enterprise.id}}", object: "enterprise", ng: { repeat: "enterprise in filteredEnterprises = ( allEnterprises | filter:{ name: quickSearch } )" } }
%tr.enterprise{ ng: { class: { even: "'even'", odd: "'odd'"} } }
%td.name{ ng: { show: 'columns.name.visible' } }
%span{ ng: { bind: "::enterprise.name" } }
%td.producer.panel-toggle.text-center{ ng: { show: 'columns.producer.visible', class: "{error: enterprise.producerError}" }, name: "producer" }
%h5{ ng: { bind: "enterprise.producer" } }
%td.package.panel-toggle.text-center{ ng: { show: 'columns.package.visible', class: "{error: enterprise.packageError}" }, name: "package" }
%h5{ ng: { bind: "enterprise.package" } }
%td.status.panel-toggle.text-center{ ng: { show: 'columns.status.visible' }, name: "status" }
%i.icon-status{ ng: { class: "enterprise.status" } }
%td.manage{ ng: { show: 'columns.manage.visible' } }
%a.button.fullwidth{ ng: { href: '{{::enterprise.edit_path}}' } }
%tr{ "ng-controller" => "ColumnsCtrl" }
%th.name{ "ng-show" => 'columns.name.visible' }=t('admin.name')
%th.producer{ "ng-show" => 'columns.producer.visible' }=t('.producer?')
%th.package{ "ng-show" => 'columns.package.visible' }=t('.package')
%th.status{ "ng-show" => 'columns.status.visible' }=t('.status')
%th.manage{ "ng-show" => 'columns.manage.visible' }=t('.manage')
%tbody.panel-ctrl{ "id" => "e_{{enterprise.id}}", "object" => "enterprise", "ng-repeat" => "enterprise in filteredEnterprises = ( allEnterprises | filter:{ name: quickSearch } )" }
%tr.enterprise{ "ng-class-even" => "'even'", "ng-class-odd" => "'odd'" }
%td.name{ "ng-show" => 'columns.name.visible' }
%span{ "ng-bind" => "::enterprise.name" }
%td.producer.panel-toggle.text-center{ "name" => "producer", "ng-show" => 'columns.producer.visible', "ng-class" => "{error: enterprise.producerError}" }
%h5{ "ng-bind" => "enterprise.producer" }
%td.package.panel-toggle.text-center{ "name" => "package", "ng-show" => 'columns.package.visible', "ng-class" => "{error: enterprise.packageError}" }
%h5{ "ng-bind" => "enterprise.package" }
%td.status.panel-toggle.text-center{ "name" => "status", "ng-show" => 'columns.status.visible' }
%i.icon-status{ "ng-class" => "enterprise.status" }
%td.manage{ "ng-show" => 'columns.manage.visible' }
%a.button.fullwidth{ "ng-href" => '{{::enterprise.edit_path}}' }
= t('.manage_link')
%i.icon-arrow-right

6
app/views/admin/enterprises/_form.html.haml
View File

@@ -1,15 +1,15 @@
- enterprise_side_menu_items(@enterprise).each do |item|
- case item[:name]
- when 'primary_details'
%fieldset.alpha.no-border-bottom{ id: "#{item[:name]}_panel", data: { controller: "primary-details", "primary-details-primary-producer-value": @enterprise.is_primary_producer.to_s, "primary-details-enterprise-sells-value": @enterprise.sells, "tabs-and-panels-target": "panel default" }}
%fieldset.alpha.no-border-bottom{ "id" => "#{item[:name]}_panel", "data-controller" => "primary-details", "data-primary-details-primary-producer-value" => @enterprise.is_primary_producer.to_s, "data-primary-details-enterprise-sells-value" => @enterprise.sells, "data-tabs-and-panels-target" => "panel default" }
%legend= t(".#{ item[:name] }.legend")
= render "admin/enterprises/form/#{ item[:form_name] || item[:name] }", f: f
- when 'enterprise_permissions'
%fieldset.alpha.no-border-bottom{ id: "#{item[:name]}_panel", data: { "tabs-and-panels-target": "panel" }}
%fieldset.alpha.no-border-bottom{ "id" => "#{item[:name]}_panel", "data-tabs-and-panels-target" => "panel" }
%legend= t(".#{ item[:name] }.legend")
- else
%fieldset.alpha.no-border-bottom{ id: "#{item[:name]}_panel", data: { "tabs-and-panels-target": "panel" }}
%fieldset.alpha.no-border-bottom{ "id" => "#{item[:name]}_panel", "data-tabs-and-panels-target" => "panel" }
%legend= t(".#{ item[:form_name] || item[:name] }.legend")
= render "admin/enterprises/form/#{ item[:form_name] || item[:name] }", f: f

4
app/views/admin/enterprises/_ng_form.html.haml
View File

@@ -8,8 +8,8 @@
"ng-cloak" => true } do |f|
%save-bar{ dirty: "enterprise_form.$dirty", persist: "true" }
%input.red{ type: "button", value: t(:update), ng: { click: "submit()", disabled: "!enterprise_form.$dirty" } }
%input{ type: "button", ng: { value: "enterprise_form.$dirty ? '#{t(:cancel)}' : '#{t(:close)}'", click: "cancel('#{main_app.admin_enterprises_path}')" } }
%input.red{ "type" => "button", "value" => t(:update), "ng-click" => "submit()", "ng-disabled" => "!enterprise_form.$dirty" }
%input{ "type" => "button", "ng-value" => "enterprise_form.$dirty ? '#{t(:cancel)}' : '#{t(:close)}'", "ng-click" => "cancel('#{main_app.admin_enterprises_path}')" }
.row{ data: {
controller: "tabs-and-panels", "tabs-and-panels-class-name-value": "selected" }}

2
app/views/admin/enterprises/form/_address.html.haml
View File

@@ -34,7 +34,7 @@
%span.required *
.four.columns
= af.select :state_id, @enterprise.address.country.states.map { |s| [s.name, s.id] }, {}, { "data-controller": "tom-select", "data-dependent-select-target": "select", class: "primary" }
.four.columns.omega{ data: { controller: "primary-details" }}
.four.columns.omega{ "data-controller" => "primary-details" }
= af.select :country_id, available_countries.map { |c| [c.name, c.id] }, {}, { "data-controller": "tom-select", "data-dependent-select-target": "source", "data-action": "dependent-select#handleSelectChange", class: "primary" }
.row
.three.columns.alpha

10
app/views/admin/enterprises/form/_business_details.html.haml
View File

@@ -31,22 +31,22 @@
= f.label :invoice_text, t('.invoice_text')
.omega.eight.columns
= f.text_area :invoice_text, style: "width: 100%; height: 100px;"
.row{ data: { controller: 'terms-and-conditions', "terms-and-conditions-message-value": t('js.admin.enterprises.form.images.immediate_terms_and_conditions_removal_warning') } }
.row{ "data-controller" => 'terms-and-conditions', "data-terms-and-conditions-message-value" => t('js.admin.enterprises.form.images.immediate_terms_and_conditions_removal_warning') }
.alpha.three.columns
= f.label :terms_and_conditions, t('.terms_and_conditions')
%i.text-big.icon-question-sign{ "data-controller": "help-modal-link", "data-action": "click->help-modal-link#open", "data-help-modal-link-target-value": "terms_and_conditions_info_modal" }
.omega.eight.columns#terms_and_conditions{data: { 'reflex-root': '#terms_and_conditions' } }
.omega.eight.columns#terms_and_conditions{ "data-reflex-root" => '#terms_and_conditions' }
- if @enterprise.terms_and_conditions.attached?
= link_to "#{@enterprise.terms_and_conditions.blob.filename} #{ t('.uploaded_on') } #{@enterprise.terms_and_conditions.blob.created_at}", url_for(@enterprise.terms_and_conditions), target: '_blank'
%div
%a.icon-trash{ href: '#', data: { action: 'click->terms-and-conditions#remove', "terms-and-conditions-message-value": t('js.admin.enterprises.form.images.immediate_terms_and_conditions_removal_warning'), 'enterprise-id': @enterprise.id}}
%a.icon-trash{ "href" => '#', "data-action" => 'click->terms-and-conditions#remove', "data-terms-and-conditions-message-value" => t('js.admin.enterprises.form.images.immediate_terms_and_conditions_removal_warning'), "data-enterprise-id" => @enterprise.id }
= t('.remove_terms_and_conditions')
.pad-top
%div
.button.small{ data: { controller: 'help-modal-link', action: 'click->help-modal-link#open', "help-modal-link-target-value": "terms_and_conditions_warning_modal" } }
.button.small{ "data-controller" => 'help-modal-link', "data-action" => 'click->help-modal-link#open', "data-help-modal-link-target-value" => "terms_and_conditions_warning_modal" }
= t('.upload')
%span{ data: { "terms-and-conditions-target": "filename" } }
%span{ "data-terms-and-conditions-target" => "filename" }
= f.file_field :terms_and_conditions, accept: 'application/pdf', style: 'display: none;', data: { "terms-and-conditions-target": "fileinput" }
= render HelpModalComponent.new(id: "terms_and_conditions_warning_modal", close_button: false ) do

4
app/views/admin/enterprises/form/_connected_apps.html.haml
View File

@@ -6,7 +6,7 @@
%p= t ".tagline"
%div
- if enterprise.connected_apps.empty?
%button{ data: {reflex: "click->Admin::ConnectedApp#create", enterprise_id: enterprise.id} }
%button{ "data-reflex" => "click->Admin::ConnectedApp#create", "data-enterprise_id" => enterprise.id }
= t ".enable"
- elsif enterprise.connected_apps.connecting.present?
%button{ disabled: true }
@@ -14,7 +14,7 @@
 
= t ".loading"
- else
%button{ data: {reflex: "click->Admin::ConnectedApp#destroy", enterprise_id: enterprise.id} }
%button{ "data-reflex" => "click->Admin::ConnectedApp#destroy", "data-enterprise_id" => enterprise.id }
= t ".disable"
.connected-app__connection

8
app/views/admin/enterprises/form/_images.html.haml
View File

@@ -4,10 +4,10 @@
%br
= t('.logo_size')
.omega.eight.columns
%img{ class: 'image-field-group__preview-image', ng: { src: '{{ Enterprise.logo.thumb }}', if: 'Enterprise.logo' } }
%img{ "class" => 'image-field-group__preview-image', "ng-src" => '{{ Enterprise.logo.thumb }}', "ng-if" => 'Enterprise.logo' }
%br
= f.file_field :logo
%a.button.red{ href: '', ng: {click: 'removeLogo()', if: 'Enterprise.logo'} }
%a.button.red{ "href" => '', "ng-click" => 'removeLogo()', "ng-if" => 'Enterprise.logo' }
= t('.remove_logo')
.row.page-admin-enterprises-form__promo-image-field-group.image-field-group
@@ -21,7 +21,7 @@
= t('.promo_image_note3')
.omega.eight.columns
%img{ class: 'image-field-group__preview-image', ng: { src: '{{ Enterprise.promo_image.large }}', if: 'Enterprise.promo_image' } }
%img{ "class" => 'image-field-group__preview-image', "ng-src" => '{{ Enterprise.promo_image.large }}', "ng-if" => 'Enterprise.promo_image' }
= f.file_field :promo_image
%a.button.red{ href: '', ng: {click: 'removePromoImage()', if: 'Enterprise.promo_image'} }
%a.button.red{ "href" => '', "ng-click" => 'removePromoImage()', "ng-if" => 'Enterprise.promo_image' }
= t('.remove_promo_image')

8
app/views/admin/enterprises/form/_permalink.html.haml
View File

@@ -1,4 +1,4 @@
.permalink#permalink{ data: { controller: 'permalink', permalink: { 'initial-permalink-value': @enterprise.permalink, 'url-value': check_permalink_enterprises_url } }}
.permalink#permalink{ "data-controller" => 'permalink', "data-permalink-initial-permalink-value" => @enterprise.permalink, "data-permalink-url-value" => check_permalink_enterprises_url }
- unless @enterprise.sells == 'none'
.row
.three.columns.alpha
@@ -7,12 +7,12 @@
.eight.columns
= text_field_tag "enterprise[permalink]", @enterprise.permalink, data: { action: "input->permalink#validate", "permalink-target": "permalinkField" }
.two.columns.omega
%div{ style: "width: 30px; height: 30px;", class: "hidden", data: { "permalink-target": "spinner" } }
%div{ "style" => "width: 30px; height: 30px;", "class" => "hidden", "data-permalink-target" => "spinner" }
= render partial: "components/admin_spinner"
%span.available.hidden{data: { "permalink-target": "available" }}
%span.available.hidden{ "data-permalink-target" => "available" }
= t('available')
%i.icon-ok-sign
%span.unavailable.hidden{data: { "permalink-target": "unavailable" }}
%span.unavailable.hidden{ "data-permalink-target" => "unavailable" }
= t('js.unavailable')
%i.icon-remove-sign

2
app/views/admin/enterprises/form/_primary_details.html.haml
View File

@@ -32,7 +32,7 @@
.four.columns.omega
= f.radio_button :sells, "any", 'ng-model' => 'Enterprise.sells', data: {action: "change->primary-details#enterpriseSellsChanged"}
= f.label :sells, t('.any'), value: "any"
%span{ style: "width: 30px; height: 30px;", class: "hidden", data: { "primary-details-target": "spinner" } }
%span{ "style" => "width: 30px; height: 30px;", "class" => "hidden", "data-primary-details-target" => "spinner" }
= render partial: "components/admin_spinner"
.row
.three.columns.alpha

12
app/views/admin/enterprises/form/_shop_preferences.html.haml
View File

@@ -23,17 +23,13 @@
= radio_button :enterprise, :preferred_shopfront_product_sorting_method, :by_category, { 'ng-model' => 'Enterprise.preferred_shopfront_product_sorting_method' }
= label :enterprise, :preferred_shopfront_product_sorting_method_by_category, t('.shopfront_sort_by_category')
.eight.columns.omega
%textarea.fullwidth{ id: 'enterprise_preferred_shopfront_taxon_order', name: 'enterprise[preferred_shopfront_taxon_order]', rows: 6,
'ofn-taxon-autocomplete' => '', 'multiple-selection' => 'true', placeholder: t('.shopfront_sort_by_category_placeholder'),
ng: { model: 'Enterprise.preferred_shopfront_taxon_order', readonly: "Enterprise.preferred_shopfront_product_sorting_method != 'by_category'" }}
%textarea.fullwidth{ "id" => 'enterprise_preferred_shopfront_taxon_order', "name" => 'enterprise[preferred_shopfront_taxon_order]', "rows" => 6, "ofn-taxon-autocomplete" => '', "multiple-selection" => 'true', "placeholder" => t('.shopfront_sort_by_category_placeholder'), "ng-model" => 'Enterprise.preferred_shopfront_taxon_order', "ng-readonly" => "Enterprise.preferred_shopfront_product_sorting_method != 'by_category'" }
.row
.three.columns.alpha
= radio_button :enterprise, :preferred_shopfront_product_sorting_method, :by_producer, { 'ng-model' => 'Enterprise.preferred_shopfront_product_sorting_method' }
= label :enterprise, :preferred_shopfront_product_sorting_method_by_producer, t('.shopfront_sort_by_producer')
.eight.columns.omega
%textarea.fullwidth{ id: 'enterprise_preferred_shopfront_producer_order', name: 'enterprise[preferred_shopfront_producer_order]', rows: 6,
'ofn-producer-autocomplete' => '', 'multiple-selection' => 'true', placeholder: t('.shopfront_sort_by_producer_placeholder'),
ng: { model: 'Enterprise.preferred_shopfront_producer_order', readonly: "Enterprise.preferred_shopfront_product_sorting_method != 'by_producer'" }}
%textarea.fullwidth{ "id" => 'enterprise_preferred_shopfront_producer_order', "name" => 'enterprise[preferred_shopfront_producer_order]', "rows" => 6, "ofn-producer-autocomplete" => '', "multiple-selection" => 'true', "placeholder" => t('.shopfront_sort_by_producer_placeholder'), "ng-model" => 'Enterprise.preferred_shopfront_producer_order', "ng-readonly" => "Enterprise.preferred_shopfront_product_sorting_method != 'by_producer'" }
.row
.three.columns.alpha
@@ -56,7 +52,7 @@
= f.radio_button :require_login, true, "ng-model" => "Enterprise.require_login", "ng-value" => "true"
= f.label :require_login, t('.shopfront_requires_login_true'), value: :true
.row{ng: {if: "!Enterprise.require_login"}}
.row{ "ng-if" => "!Enterprise.require_login" }
.three.columns.alpha
%label= t '.allow_guest_orders'
%div{'ofn-with-tip' => t('.allow_guest_orders_tip')}
@@ -67,7 +63,7 @@
.five.columns.omega
= f.radio_button :allow_guest_orders, false, "ng-model" => "Enterprise.allow_guest_orders", "ng-value" => "false"
= f.label :allow_guest_orders, t('.allow_guest_orders_false'), value: :false
.row.warning{ng: {show: 'Enterprise.allow_guest_orders && Enterprise.allow_order_changes'}}
.row.warning{ "ng-show" => 'Enterprise.allow_guest_orders && Enterprise.allow_order_changes' }
.eight.columns.alpha.omega
%i.icon-warning-sign
= t '.recommend_require_login'

16
app/views/admin/enterprises/form/_tag_rules.html.haml
View File

@@ -1,11 +1,11 @@
.row{ ng: { controller: "TagRulesCtrl" } }
.row{ "ng-controller" => "TagRulesCtrl" }
.eleven.columns.alpha.omega
%ofn-sortable{ axis: "y", handle: ".header", items: '.customer_tag', position: "tagGroup.position", after: { sort: "updateRuleCounts()" } }
.no_tags{ ng: { show: "tagGroups.length == 0" } }
%ofn-sortable{ "axis" => "y", "handle" => ".header", "items" => '.customer_tag', "position" => "tagGroup.position", "after-sort" => "updateRuleCounts()" }
.no_tags{ "ng-show" => "tagGroups.length == 0" }
= t('.no_tags_yet')
= render 'admin/enterprises/form/tag_rules/default_rules'
-# = render 'customer_tags'
.customer_tag{ id: "tg_{{tagGroup.position}}", ng: { repeat: "tagGroup in tagGroups" } }
.customer_tag{ "id" => "tg_{{tagGroup.position}}", "ng-repeat" => "tagGroup in tagGroups" }
.header
%table
%colgroup
@@ -16,12 +16,12 @@
%h5
= t('.for_customers_tagged')
%td
%tags-with-translation{ object: "tagGroup", max: 1, on: { tag: { added: "updateTagsRulesFor(tagGroup)", removed: "updateTagsRulesFor(tagGroup)" } } }
%tags-with-translation{ "object" => "tagGroup", "max" => 1, "on-tag-added" => "updateTagsRulesFor(tagGroup)", "on-tag-removed" => "updateTagsRulesFor(tagGroup)" }
.no_rules{ ng: { show: "tagGroup.rules.length == 0" } }
.no_rules{ "ng-show" => "tagGroup.rules.length == 0" }
= t('.no_rules_yet')
.tag_rule{ ng: { repeat: "rule in tagGroup.rules" } }
.tag_rule{ "ng-repeat" => "rule in tagGroup.rules" }
.add_rule.text-center
%input.button.icon-plus{ type: 'button', value: t('.add_new_rule'), "add-new-rule-to" => "addNewRuleTo", "tag-group" => "tagGroup", "new-tag-rule-dialog" => true }
.add_tag
%input.button.red.icon-plus{ type: 'button', value: t('.add_new_tag'), ng: { click: 'addNewTag()' } }
%input.button.red.icon-plus{ "type" => 'button', "value" => t('.add_new_tag'), "ng-click" => 'addNewTag()' }

16
app/views/admin/enterprises/form/_users.html.haml
View File

@@ -21,8 +21,8 @@
= render partial: 'admin/shared/whats_this_tooltip', locals: {tooltip_text: t('.contact_tip')}
.eight.columns.omega
- if full_permissions
%select.select2.fullwidth{id: 'receives_notifications_dropdown', name: 'receives_notifications', ng: {model: 'receivesNotifications', init: "receivesNotifications = '#{@enterprise.contact.id}'"}}
%option{ng: {repeat: 'user in Enterprise.users', selected: "user.id == #{@enterprise.contact.id}", hide: '!user.confirmed'}, value: '{{user.id}}'}
%select.select2.fullwidth{ "id" => 'receives_notifications_dropdown', "name" => 'receives_notifications', "ng-model" => 'receivesNotifications', "ng-init" => "receivesNotifications = '#{@enterprise.contact.id}'" }
%option{ "value" => '{{user.id}}', "ng-repeat" => 'user in Enterprise.users', "ng-selected" => "user.id == #{@enterprise.contact.id}", "ng-hide" => '!user.confirmed' }
{{user.email}}
- else
= @enterprise.contact.email
@@ -41,16 +41,16 @@
- # Ignore this input in the submit
= hidden_field_tag :ignored, nil, class: "select2 fullwidth", 'user-select' => 'newManager', 'ng-model' => 'newManager'
%td.actions
%tr.animate-repeat{ id: "manager-{{manager.id}}", ng: { repeat: 'manager in Enterprise.users' }}
%tr.animate-repeat{ "id" => "manager-{{manager.id}}", "ng-repeat" => 'manager in Enterprise.users' }
%td
= hidden_field_tag "enterprise[user_ids][]", nil, multiple: true, 'ng-value' => 'manager.id'
{{ manager.email }}
%i.confirmation.confirmed.fa.fa-check-circle{ 'ofn-with-tip' => t('.email_confirmed'), ng: {show: 'manager.confirmed'} }
%i.confirmation.unconfirmed.fa.fa-exclamation-triangle{ 'ofn-with-tip' => t('.email_not_confirmed'), ng: {show: '!manager.confirmed'} }
%i.role.contact.fa.fa-envelope-o{ 'ofn-with-tip' => t('.contact'), ng: {show: 'manager.id == receivesNotifications'} }
%i.role.owner.fa.fa-star{ 'ofn-with-tip' => t('.owner'), ng: {show: 'manager.id == Enterprise.owner.id'} }
%i.confirmation.confirmed.fa.fa-check-circle{ "ofn-with-tip" => t('.email_confirmed'), "ng-show" => 'manager.confirmed' }
%i.confirmation.unconfirmed.fa.fa-exclamation-triangle{ "ofn-with-tip" => t('.email_not_confirmed'), "ng-show" => '!manager.confirmed' }
%i.role.contact.fa.fa-envelope-o{ "ofn-with-tip" => t('.contact'), "ng-show" => 'manager.id == receivesNotifications' }
%i.role.owner.fa.fa-star{ "ofn-with-tip" => t('.owner'), "ng-show" => 'manager.id == Enterprise.owner.id' }
%td.actions
%a{ ng: {click: 'removeManager(manager)', class: "{disabled: manager.id == Enterprise.owner.id || manager.id == receivesNotifications}"}, :class => "icon-trash no-text" }
%a{ "class" => "icon-trash no-text", "ng-click" => 'removeManager(manager)', "ng-class" => "{disabled: manager.id == Enterprise.owner.id || manager.id == receivesNotifications}" }
- else
- @enterprise.users.each do |manager|

4
app/views/admin/enterprises/form/tag_rules/_default_rules.html.haml
View File

@@ -8,9 +8,9 @@
%h5
= t('.by_default')
%i.text-big.icon-question-sign{ "data-controller": "help-modal-link", "data-action": "click->help-modal-link#open", "data-help-modal-link-target-value": "tag_rule_help_modal" }
.no_rules{ ng: { show: "defaultTagGroup.rules.length == 0" } }
.no_rules{ "ng-show" => "defaultTagGroup.rules.length == 0" }
= t('.no_rules_yet')
.tag_rule{ ng: { repeat: "rule in defaultTagGroup.rules" } }
.tag_rule{ "ng-repeat" => "rule in defaultTagGroup.rules" }
.add_rule.text-center
%input.button.icon-plus{ type: 'button', value: t('.add_new_button'), "add-new-rule-to" => "addNewRuleTo", "tag-group" => "defaultTagGroup", "new-tag-rule-dialog" => true }

2
app/views/admin/enterprises/new.html.haml
View File

@@ -16,5 +16,5 @@
= form_for [main_app, :admin, @enterprise], html: { "nav-check" => '', "nav-callback" => '' } do |f|
.row
.twelve.columns.fullwidth_inputs{ ng: { controller: "NewEnterpriseController" } }
.twelve.columns.fullwidth_inputs{ "ng-controller" => "NewEnterpriseController" }
= render 'new_form', f: f, scope: 'admin.enterprises.form'

6
app/views/admin/order_cycles/_exchange_form.html.haml
View File

@@ -1,4 +1,4 @@
%tr{ ng: { class: "'#{type} #{type}-{{ exchange.enterprise_id }}'" } }
%tr{ "ng-class" => "'#{type} #{type}-{{ exchange.enterprise_id }}'" }
%td{:class => "#{type}_name"} {{ enterprises[exchange.enterprise_id].name }}
%td.products.panel-toggle.text-center{ name: "products" }
{{ exchangeSelectedVariants(exchange) }} / {{ exchangeTotalVariants(exchange) }}
@@ -7,7 +7,7 @@
%td.receival-details
= text_field_tag 'order_cycle_incoming_exchange_{{ $index }}_receival_instructions', '', 'id' => 'order_cycle_incoming_exchange_{{ $index }}_receival_instructions', 'placeholder' => t('.receival_instructions_placeholder'), 'ng-model' => 'exchange.receival_instructions'
- if type == 'distributor'
%td.tags.panel-toggle.text-center{ name: "tags", ng: { if: 'enterprises[exchange.enterprise_id].managed || order_cycle.viewing_as_coordinator' } }
%td.tags.panel-toggle.text-center{ "name" => "tags", "ng-if" => 'enterprises[exchange.enterprise_id].managed || order_cycle.viewing_as_coordinator' }
{{ exchange.tags.length }}
%td.collection-details
= text_field_tag 'order_cycle_outgoing_exchange_{{ $index }}_pickup_time', '', 'ng-init' => 'setPickupTimeFieldDirty($index, exchange.pickup_time)', 'id' => 'order_cycle_outgoing_exchange_{{ $index }}_pickup_time', 'required' => 'required', 'placeholder' => t('.pickup_time_placeholder'), 'ng-model' => 'exchange.pickup_time', 'ng-disabled' => '!enterprises[exchange.enterprise_id].managed && !order_cycle.viewing_as_coordinator', 'maxlength' => 35
@@ -16,7 +16,7 @@
= text_field_tag 'order_cycle_outgoing_exchange_{{ $index }}_pickup_instructions', '', 'id' => 'order_cycle_outgoing_exchange_{{ $index }}_pickup_instructions', 'placeholder' => t('.pickup_instructions_placeholder'), 'ng-model' => 'exchange.pickup_instructions', 'ng-disabled' => '!enterprises[exchange.enterprise_id].managed && !order_cycle.viewing_as_coordinator'
%span.icon-question-sign{'ofn-with-tip' => t('.pickup_instructions_tip')}
%td.fees
%ol{ ng: { show: 'enterprises[exchange.enterprise_id].managed || order_cycle.viewing_as_coordinator' } }
%ol{ "ng-show" => 'enterprises[exchange.enterprise_id].managed || order_cycle.viewing_as_coordinator' }
%li{'ng-repeat' => 'enterprise_fee in exchange.enterprise_fees'}
= select_tag 'order_cycle_{{ exchangeDirection(exchange) }}_exchange_{{ $parent.$index }}_enterprise_fees_{{ $index }}_enterprise_id', nil, {'id' => 'order_cycle_{{ exchangeDirection(exchange) }}_exchange_{{ $parent.$index }}_enterprise_fees_{{ $index }}_enterprise_id', 'ng-model' => 'enterprise_fee.enterprise_id', 'ng-options' => 'enterprise.id as enterprise.name for enterprise in enterprisesWithFees()'}

8
app/views/admin/order_cycles/_filters.html.haml
View File

@@ -2,20 +2,20 @@
.filter.four.columns.alpha
%label{ :for => 'query' }=t('admin.quick_search')
%br
%input.fullwidth{ :type => "text", :id => 'query', ng: { model: 'query' }, placeholder: t(".search_by_order_cycle_name") }
%input.fullwidth{ "type" => "text", "id" => 'query', "placeholder" => t(".search_by_order_cycle_name"), "ng-model" => 'query' }
.filter_select.four.columns
%label{ :for => 'involving_filter' }=t('.involving')
%br
%input.ofn-select2.fullwidth{ id: 'involving_filter', type: 'number', blank: "{id: 0, name: '#{j t(".any_enterprise")}'}", data: 'enterprises', ng: { model: 'involvingFilter' } }
%input.ofn-select2.fullwidth{ "id" => 'involving_filter', "type" => 'number', "blank" => "{id: 0, name: '#{j t(".any_enterprise")}'}", "data" => 'enterprises', "ng-model" => 'involvingFilter' }
- if subscriptions_enabled?
.filter_select.four.columns
%label{ :for => 'schedule_filter' }=t('admin.order_cycles.index.schedule')
%br
%input.ofn-select2.fullwidth{ id: 'schedule_filter', type: 'number', blank: "{id: 0, name: '#{j t(".any_schedule")}'}", data: 'schedules', ng: { model: 'scheduleFilter' } }
%input.ofn-select2.fullwidth{ "id" => 'schedule_filter', "type" => 'number', "blank" => "{id: 0, name: '#{j t(".any_schedule")}'}", "data" => 'schedules', "ng-model" => 'scheduleFilter' }
.one.columns  
- else
.five.columns  
.filter_clear.three.columns.omega
%label{ :for => 'clear_all_filters' }
%br
%input.red.fullwidth{ :type => 'button', :id => 'clear_all_filters', :value => "#{t('admin.clear_all')}", ng: { click: "resetSelectFilters()" } }
%input.red.fullwidth{ "type" => 'button', "id" => 'clear_all_filters', "value" => "#{t('admin.clear_all')}", "ng-click" => "resetSelectFilters()" }

32
app/views/admin/order_cycles/_header.html.haml
View File

@@ -1,35 +1,35 @@
%colgroup
%col{ ng: { show: 'columns.name.visible' } }
%col{ ng: { show: 'columns.schedules.visible' } }
%col{ ng: { show: 'columns.open.visible' }, style: 'width: 20%;' }
%col{ ng: { show: 'columns.close.visible' }, style: 'width: 20%;' }
%col{ "ng-show" => 'columns.name.visible' }
%col{ "ng-show" => 'columns.schedules.visible' }
%col{ "style" => 'width: 20%;', "ng-show" => 'columns.open.visible' }
%col{ "style" => 'width: 20%;', "ng-show" => 'columns.close.visible' }
- unless simple_index
%col{ ng: { show: 'columns.producers.visible' } }
%col{ ng: { show: 'columns.coordinator.visible' } }
%col{ ng: { show: 'columns.shops.visible' } }
%col{ ng: { show: 'columns.products.visible' } }
%col{ "ng-show" => 'columns.producers.visible' }
%col{ "ng-show" => 'columns.coordinator.visible' }
%col{ "ng-show" => 'columns.shops.visible' }
%col{ "ng-show" => 'columns.products.visible' }
%col{ style: 'width: 5%;' }
%col{ style: 'width: 5%;' }
%col{ style: 'width: 5%;' }
%thead
%tr
%th{ ng: { show: 'columns.name.visible' } }
%th{ "ng-show" => 'columns.name.visible' }
=t :name
%th{ ng: { show: 'columns.schedules.visible' } }
%th{ "ng-show" => 'columns.schedules.visible' }
=t('admin.order_cycles.index.schedules')
%th{ ng: { show: 'columns.open.visible' } }
%th{ "ng-show" => 'columns.open.visible' }
=t :open
%th{ ng: { show: 'columns.close.visible' } }
%th{ "ng-show" => 'columns.close.visible' }
=t :close
- unless simple_index
%th{ ng: { show: 'columns.producers.visible' } }
%th{ "ng-show" => 'columns.producers.visible' }
=t :label_producers
%th{ ng: { show: 'columns.coordinator.visible' } }
%th{ "ng-show" => 'columns.coordinator.visible' }
=t :coordinator
%th{ ng: { show: 'columns.shops.visible' } }
%th{ "ng-show" => 'columns.shops.visible' }
=t :label_shops
%th{ ng: { show: 'columns.products.visible' } }
%th{ "ng-show" => 'columns.products.visible' }
=t :products
%th.actions
%th.actions

6
app/views/admin/order_cycles/_loading_flash.html.haml
View File

@@ -1,6 +1,6 @@
%div.sixteen.columns.alpha.omega#loading{ ng: { cloak: true, if: 'RequestMonitor.loading' } }
%div.sixteen.columns.alpha.omega#loading{ "ng-cloak" => true, "ng-if" => 'RequestMonitor.loading' }
= render partial: "components/admin_spinner"
%h1{ ng: { hide: 'orderCycles.length > 0' } }
%h1{ "ng-hide" => 'orderCycles.length > 0' }
= t('.loading_order_cycles')
%h1{ ng: { show: 'orderCycles.length > 0' } }
%h1{ "ng-show" => 'orderCycles.length > 0' }
= t('.loading')

7
app/views/admin/order_cycles/_name_and_timing_form.html.haml
View File

@@ -35,11 +35,6 @@
= f.label :schedule_ids, t('admin.order_cycles.index.schedules')
.six.columns
- if viewing_as_coordinator_of?(@order_cycle)
%input.fullwidth.ofn-select2#schedule_ids{ name: 'order_cycle[schedule_ids]',
data: 'schedules',
multiple: 'true',
placeholder: t('admin.please_select'),
filter: '{viewing_as_coordinator: true}',
ng: { model: 'order_cycle.schedule_ids' } }
%input.fullwidth.ofn-select2#schedule_ids{ "name" => 'order_cycle[schedule_ids]', "data" => 'schedules', "multiple" => 'true', "placeholder" => t('admin.please_select'), "filter" => '{viewing_as_coordinator: true}', "ng-model" => 'order_cycle.schedule_ids' }
- else
%schedule-list{ 'order-cycle' => 'order_cycle' }

50
app/views/admin/order_cycles/_row.html.haml
View File

@@ -1,39 +1,39 @@
%tr{ class: "order-cycle-{{orderCycle.id}} {{orderCycle.status}}", ng: { repeat: 'orderCycle in orderCycles | schedule:scheduleFilter | involving:involvingFilter | filter:{name: query} track by orderCycle.id' } }
%td.name{ ng: { show: 'columns.name.visible' } }
%input{ id: 'oc{{::orderCycle.id}}_name', name: 'oc{{::orderCycle.id}}[name]', type: 'text', ng: { model: 'orderCycle.name', disabled: '!orderCycle.viewing_as_coordinator' } }
%td.schedules{ ng: { show: 'columns.schedules.visible' } }
%span{ ng: { repeat: 'schedule in orderCycle.schedules'} }
%tr{ "class" => "order-cycle-{{orderCycle.id}} {{orderCycle.status}}", "ng-repeat" => 'orderCycle in orderCycles | schedule:scheduleFilter | involving:involvingFilter | filter:{name: query} track by orderCycle.id' }
%td.name{ "ng-show" => 'columns.name.visible' }
%input{ "id" => 'oc{{::orderCycle.id}}_name', "name" => 'oc{{::orderCycle.id}}[name]', "type" => 'text', "ng-model" => 'orderCycle.name', "ng-disabled" => '!orderCycle.viewing_as_coordinator' }
%td.schedules{ "ng-show" => 'columns.schedules.visible' }
%span{ "ng-repeat" => 'schedule in orderCycle.schedules' }
%a{ 'schedule-dialog' => true, 'schedule-id' => '{{schedule.id}}' }
{{ schedule.name + ($last ? '' : ',') }}
%span{ ng: { show: 'orderCycle.schedules.length == 0'}} None
%td.orders_open_at{ ng: { show: 'columns.open.visible' } }
%input.datetimepicker{ id: 'oc{{::orderCycle.id}}_orders_open_at', name: 'oc{{::orderCycle.id}}[orders_open_at]', type: 'text', ng: { if: 'orderCycle.viewing_as_coordinator', model: 'orderCycle.orders_open_at' }, data: { controller: "flatpickr", "flatpickr-enable-time-value": true }, 'change-warning' => 'orderCycle' }
%input{ id: 'oc{{::orderCycle.id}}_orders_open_at', name: 'oc{{::orderCycle.id}}[orders_open_at]', type: 'text', ng: { if: '!orderCycle.viewing_as_coordinator', model: 'orderCycle.orders_open_at'}, disabled: true }
%td.orders_close_at{ ng: { show: 'columns.close.visible' } }
%input.datetimepicker{ id: 'oc{{::orderCycle.id}}_orders_close_at', name: 'oc{{::orderCycle.id}}[orders_close_at]', type: 'text', ng: { if: 'orderCycle.viewing_as_coordinator', model: 'orderCycle.orders_close_at' }, data: { controller: "flatpickr", "flatpickr-enable-time-value": true }, 'change-warning' => 'orderCycle' }
%input{ id: 'oc{{::orderCycle.id}}_orders_close_at', name: 'oc{{::orderCycle.id}}[orders_close_at]', type: 'text', ng: { if: '!orderCycle.viewing_as_coordinator', model: 'orderCycle.orders_close_at'}, disabled: true }
%span{ "ng-show" => 'orderCycle.schedules.length == 0' } None
%td.orders_open_at{ "ng-show" => 'columns.open.visible' }
%input.datetimepicker{ "id" => 'oc{{::orderCycle.id}}_orders_open_at', "name" => 'oc{{::orderCycle.id}}[orders_open_at]', "type" => 'text', "change-warning" => 'orderCycle', "ng-if" => 'orderCycle.viewing_as_coordinator', "ng-model" => 'orderCycle.orders_open_at', "data-controller" => "flatpickr", "data-flatpickr-enable-time-value" => true }
%input{ "id" => 'oc{{::orderCycle.id}}_orders_open_at', "name" => 'oc{{::orderCycle.id}}[orders_open_at]', "type" => 'text', "disabled" => true, "ng-if" => '!orderCycle.viewing_as_coordinator', "ng-model" => 'orderCycle.orders_open_at' }
%td.orders_close_at{ "ng-show" => 'columns.close.visible' }
%input.datetimepicker{ "id" => 'oc{{::orderCycle.id}}_orders_close_at', "name" => 'oc{{::orderCycle.id}}[orders_close_at]', "type" => 'text', "change-warning" => 'orderCycle', "ng-if" => 'orderCycle.viewing_as_coordinator', "ng-model" => 'orderCycle.orders_close_at', "data-controller" => "flatpickr", "data-flatpickr-enable-time-value" => true }
%input{ "id" => 'oc{{::orderCycle.id}}_orders_close_at', "name" => 'oc{{::orderCycle.id}}[orders_close_at]', "type" => 'text', "disabled" => true, "ng-if" => '!orderCycle.viewing_as_coordinator', "ng-model" => 'orderCycle.orders_close_at' }
- unless simple_index
%td.producers{ ng: { show: 'columns.producers.visible' } }
%span{'ofn-with-tip' => '{{ orderCycle.producerNames }}', ng: { show: 'orderCycle.producers.length > 3' } }
%td.producers{ "ng-show" => 'columns.producers.visible' }
%span{ "ofn-with-tip" => '{{ orderCycle.producerNames }}', "ng-show" => 'orderCycle.producers.length > 3' }
{{ orderCycle.producers.length }}
= t('.suppliers')
%span{ ng: { hide: 'orderCycle.producers.length > 3', bind: 'orderCycle.producerNames' } }
%td.coordinator{ ng: { show: 'columns.coordinator.visible', bind: { html: 'orderCycle.coordinator.name'} } }
%td.shops{ ng: { show: 'columns.shops.visible' } }
%span{'ofn-with-tip' => '{{ orderCycle.shopNames }}', ng: { show: 'orderCycle.shops.length > 3' } }
%span{ "ng-hide" => 'orderCycle.producers.length > 3', "ng-bind" => 'orderCycle.producerNames' }
%td.coordinator{ "ng-show" => 'columns.coordinator.visible', "ng-bind-html" => 'orderCycle.coordinator.name' }
%td.shops{ "ng-show" => 'columns.shops.visible' }
%span{ "ofn-with-tip" => '{{ orderCycle.shopNames }}', "ng-show" => 'orderCycle.shops.length > 3' }
{{ orderCycle.shops.length }}
= t('.distributors')
%span{ ng: { hide: 'orderCycle.shops.length > 3', bind: 'orderCycle.shopNames' } }
%span{ "ng-hide" => 'orderCycle.shops.length > 3', "ng-bind" => 'orderCycle.shopNames' }
%td.products{ ng: { show: 'columns.products.visible' } }
%td.products{ "ng-show" => 'columns.products.visible' }
%span
{{orderCycle.variant_count}}
= t('.variants')
%td.actions
%a.edit-order-cycle.icon-edit.no-text{ ng: { href: '{{orderCycle.edit_path}}'}, 'ofn-with-tip' => t(:edit) }
%td.actions{ ng: { if: 'orderCycle.viewing_as_coordinator' } }
%a.clone-order-cycle.icon-copy.no-text{ ng: { href: '{{orderCycle.clone_path}}'}, 'ofn-with-tip' => t(:clone) }
%td.actions{ ng: { if: 'orderCycle.deletable && orderCycle.viewing_as_coordinator' }}
%a.delete-order-cycle.icon-trash.no-text{ ng: { href: '{{orderCycle.delete_path}}'}, data: { method: 'delete', confirm: t(:are_you_sure), "ujs-navigate": "false" }, 'ofn-with-tip' => t(:remove) }
%a.edit-order-cycle.icon-edit.no-text{ "ofn-with-tip" => t(:edit), "ng-href" => '{{orderCycle.edit_path}}' }
%td.actions{ "ng-if" => 'orderCycle.viewing_as_coordinator' }
%a.clone-order-cycle.icon-copy.no-text{ "ofn-with-tip" => t(:clone), "ng-href" => '{{orderCycle.clone_path}}' }
%td.actions{ "ng-if" => 'orderCycle.deletable && orderCycle.viewing_as_coordinator' }
%a.delete-order-cycle.icon-trash.no-text{ "ofn-with-tip" => t(:remove), "ng-href" => '{{orderCycle.delete_path}}', "data-method" => 'delete', "data-confirm" => t(:are_you_sure), "data-ujs-navigate" => "false" }

6
app/views/admin/order_cycles/_show_more.html.haml
View File

@@ -1,4 +1,4 @@
.text-center.margin-bottom-50{ ng: { hide: "RequestMonitor.loading" } }
%input{ type: 'button', value: "#{t('admin.show_n_more', num: '30')} #{t(:days)}", ng: { click: 'showMore(30)' } }
.text-center.margin-bottom-50{ "ng-hide" => "RequestMonitor.loading" }
%input{ "type" => 'button', "value" => "#{t('admin.show_n_more', num: '30')} #{t(:days)}", "ng-click" => 'showMore(30)' }
%input{ type: 'button', value: "#{t('admin.show_n_more', num: '90')} #{t(:days)}", ng: { click: 'showMore(90)' } }
%input{ "type" => 'button', "value" => "#{t('admin.show_n_more', num: '90')} #{t(:days)}", "ng-click" => 'showMore(90)' }

4
app/views/admin/order_cycles/_simple_form.html.haml
View File

@@ -15,9 +15,9 @@
= label_tag t('.products')
%table.exchanges
%tbody{ng: {repeat: "exchange in order_cycle.incoming_exchanges"}}
%tbody{ "ng-repeat" => "exchange in order_cycle.incoming_exchanges" }
%tr.products
%td{ ng: { include: "'admin/panels/exchange_products_simple.html'" } }
%td{ "ng-include" => "'admin/panels/exchange_products_simple.html'" }
%br
= label_tag t('.tags')

12
app/views/admin/order_cycles/edit.html.haml
View File

@@ -6,7 +6,7 @@
- url = main_app.notify_producers_admin_order_cycle_path
- confirm_msg = "#{t('.notify_producers_tip')} #{t(:are_you_sure)}"
%a.button.icon-email.with-tip{ href: url, data: { method: :post, "ujs-navigate": "false", confirm: confirm_msg }, 'data-powertip': t('.notify_producers_tip') }
%a.button.icon-email.with-tip{ "href" => url, "data-powertip" => t('.notify_producers_tip'), "data-method" => :post, "data-ujs-navigate" => "false", "data-confirm" => confirm_msg }
= mails_sent ? t('.re_notify_producers') : t(:notify_producers)
- if mails_sent
.badge.icon-ok.success
@@ -19,13 +19,13 @@
= form_for [main_app, :admin, @order_cycle], :url => '', :html => {:class => 'ng order_cycle', 'ng-app' => 'admin.orderCycles', 'ng-controller' => ng_controller, name: 'order_cycle_form'} do |f|
%save-bar{ dirty: "order_cycle_form.$dirty", persist: "true" }
%input.red{ type: "button", value: t('.save'), ng: { click: "submit($event, null)", disabled: "!order_cycle_form.$dirty || order_cycle_form.$invalid" } }
%input.red{ "type" => "button", "value" => t('.save'), "ng-click" => "submit($event, null)", "ng-disabled" => "!order_cycle_form.$dirty || order_cycle_form.$invalid" }
- if @order_cycle.simple?
%input.red{ type: "button", value: t('.save_and_back_to_list'), ng: { click: "submit($event, '#{main_app.admin_order_cycles_path}')", disabled: "!order_cycle_form.$dirty || order_cycle_form.$invalid" } }
%input.red{ "type" => "button", "value" => t('.save_and_back_to_list'), "ng-click" => "submit($event, '#{main_app.admin_order_cycles_path}')", "ng-disabled" => "!order_cycle_form.$dirty || order_cycle_form.$invalid" }
- else
%input.red{ type: "button", value: t('.save_and_next'), ng: { click: "submit($event, '#{main_app.admin_order_cycle_incoming_path(@order_cycle)}')", disabled: "!order_cycle_form.$dirty || order_cycle_form.$invalid" } }
%input{ type: "button", value: t('.next'), ng: { click: "cancel('#{main_app.admin_order_cycle_incoming_path(@order_cycle)}')", disabled: "order_cycle_form.$dirty" } }
%input{ type: "button", ng: { value: "order_cycle_form.$dirty ? '#{t('.cancel')}' : '#{t('.back_to_list')}'", click: "cancel('#{main_app.admin_order_cycles_path}')" } }
%input.red{ "type" => "button", "value" => t('.save_and_next'), "ng-click" => "submit($event, '#{main_app.admin_order_cycle_incoming_path(@order_cycle)}')", "ng-disabled" => "!order_cycle_form.$dirty || order_cycle_form.$invalid" }
%input{ "type" => "button", "value" => t('.next'), "ng-click" => "cancel('#{main_app.admin_order_cycle_incoming_path(@order_cycle)}')", "ng-disabled" => "order_cycle_form.$dirty" }
%input{ "type" => "button", "ng-value" => "order_cycle_form.$dirty ? '#{t('.cancel')}' : '#{t('.back_to_list')}'", "ng-click" => "cancel('#{main_app.admin_order_cycles_path}')" }
- if @order_cycle.simple?
= render 'simple_form', f: f

8
app/views/admin/order_cycles/incoming.html.haml
View File

@@ -9,10 +9,10 @@
= render 'wizard_progress'
%save-bar{ dirty: "order_cycle_form.$dirty", persist: "true" }
%input.red{ type: "button", value: t('.save'), ng: { click: "submit($event, null)", disabled: "!order_cycle_form.$dirty || order_cycle_form.$invalid" } }
%input.red{ type: "button", value: t('.save_and_next'), ng: { click: "submit($event, '#{main_app.admin_order_cycle_outgoing_path(@order_cycle)}')", disabled: "!order_cycle_form.$dirty || order_cycle_form.$invalid" } }
%input{ type: "button", value: t('.next'), ng: { click: "cancel('#{main_app.admin_order_cycle_outgoing_path(@order_cycle)}')", disabled: "order_cycle_form.$dirty" } }
%input{ type: "button", ng: { value: "order_cycle_form.$dirty ? '#{t('.cancel')}' : '#{t('.back_to_list')}'", click: "cancel('#{main_app.admin_order_cycles_path}')" } }
%input.red{ "type" => "button", "value" => t('.save'), "ng-click" => "submit($event, null)", "ng-disabled" => "!order_cycle_form.$dirty || order_cycle_form.$invalid" }
%input.red{ "type" => "button", "value" => t('.save_and_next'), "ng-click" => "submit($event, '#{main_app.admin_order_cycle_outgoing_path(@order_cycle)}')", "ng-disabled" => "!order_cycle_form.$dirty || order_cycle_form.$invalid" }
%input{ "type" => "button", "value" => t('.next'), "ng-click" => "cancel('#{main_app.admin_order_cycle_outgoing_path(@order_cycle)}')", "ng-disabled" => "order_cycle_form.$dirty" }
%input{ "type" => "button", "ng-value" => "order_cycle_form.$dirty ? '#{t('.cancel')}' : '#{t('.back_to_list')}'", "ng-click" => "cancel('#{main_app.admin_order_cycles_path}')" }
%fieldset.no-border-bottom
%legend{ align: 'center'}= t('.incoming')

8
app/views/admin/order_cycles/index.html.haml
View File

@@ -14,19 +14,19 @@
= admin_inject_column_preferences module: 'admin.orderCycles'
%div{ ng: { controller: 'OrderCyclesCtrl' } }
%div{ "ng-controller" => 'OrderCyclesCtrl' }
= render 'admin/order_cycles/filters'
%hr.divider
.row.controls{ ng: { show: "orderCycles.length > 0" } }
.row.controls{ "ng-show" => "orderCycles.length > 0" }
.thirteen.columns.alpha  
%columns-dropdown{ action: "#{controller_name}_#{action_name}" }
%form{ name: 'order_cycles_form' }
%save-bar{ dirty: "order_cycles_form.$dirty", persist: "false" }
%input.red{ type: "button", value: t(:save_changes), ng: { click: "saveAll()", disabled: "!order_cycles_form.$dirty" } }
%table.index#listing_order_cycles{ ng: { show: 'orderCycles.length > 0' } }
%input.red{ "type" => "button", "value" => t(:save_changes), "ng-click" => "saveAll()", "ng-disabled" => "!order_cycles_form.$dirty" }
%table.index#listing_order_cycles{ "ng-show" => 'orderCycles.length > 0' }
= render 'admin/order_cycles/header' #, simple_index: simple_index
%tbody
= render 'admin/order_cycles/row' #, simple_index: simple_index

4
app/views/admin/order_cycles/new.html.haml
View File

@@ -9,8 +9,8 @@
%save-bar{ dirty: "order_cycle_form.$dirty", persist: "true" }
- if @order_cycle.simple?
- custom_redirect_path = main_app.admin_order_cycles_path
%input.red{ type: "button", value: t('.create'), ng: { click: "submit($event, '#{custom_redirect_path}')", disabled: "!order_cycle_form.$dirty || order_cycle_form.$invalid" } }
%input{ type: "button", ng: { value: "order_cycle_form.$dirty ? '#{t('.cancel')}' : '#{t('.back_to_list')}'", click: "cancel('#{main_app.admin_order_cycles_path}')" } }
%input.red{ "type" => "button", "value" => t('.create'), "ng-click" => "submit($event, '#{custom_redirect_path}')", "ng-disabled" => "!order_cycle_form.$dirty || order_cycle_form.$invalid" }
%input{ "type" => "button", "ng-value" => "order_cycle_form.$dirty ? '#{t('.cancel')}' : '#{t('.back_to_list')}'", "ng-click" => "cancel('#{main_app.admin_order_cycles_path}')" }
- if @order_cycle.simple?
= render 'simple_form', f: f

10
app/views/admin/order_cycles/outgoing.html.haml
View File

@@ -9,10 +9,10 @@
= render 'wizard_progress'
%save-bar{ dirty: "order_cycle_form.$dirty", persist: "true" }
%input.red{ type: "button", value: t('.save'), ng: { click: "submit($event, null)", disabled: "!order_cycle_form.$dirty || order_cycle_form.$invalid" } }
%input.red{ type: "button", value: t('.save_and_next'), ng: { click: "submit($event, '#{main_app.admin_order_cycle_checkout_options_path(@order_cycle)}')", disabled: "!order_cycle_form.$dirty || order_cycle_form.$invalid" } }
%input{ type: "button", value: t('.next'), ng: { click: "cancel('#{main_app.admin_order_cycle_checkout_options_path(@order_cycle)}')", disabled: "order_cycle_form.$dirty" } }
%input{ type: "button", ng: { value: "order_cycle_form.$dirty ? '#{t('.cancel')}' : '#{t('.back_to_list')}'", click: "cancel('#{main_app.admin_order_cycles_path}')" } }
%input.red{ "type" => "button", "value" => t('.save'), "ng-click" => "submit($event, null)", "ng-disabled" => "!order_cycle_form.$dirty || order_cycle_form.$invalid" }
%input.red{ "type" => "button", "value" => t('.save_and_next'), "ng-click" => "submit($event, '#{main_app.admin_order_cycle_checkout_options_path(@order_cycle)}')", "ng-disabled" => "!order_cycle_form.$dirty || order_cycle_form.$invalid" }
%input{ "type" => "button", "value" => t('.next'), "ng-click" => "cancel('#{main_app.admin_order_cycle_checkout_options_path(@order_cycle)}')", "ng-disabled" => "order_cycle_form.$dirty" }
%input{ "type" => "button", "ng-value" => "order_cycle_form.$dirty ? '#{t('.cancel')}' : '#{t('.back_to_list')}'", "ng-click" => "cancel('#{main_app.admin_order_cycles_path}')" }
%fieldset.no-border-bottom
%legend{ align: 'center'}= t('.outgoing')
@@ -27,7 +27,7 @@
%a{href: '#', 'ng-click' => "OrderCycle.toggleAllProducts('outgoing')"}
%span{'ng-show' => "OrderCycle.showProducts['outgoing']"}= t(:collapse_all)
%span{'ng-hide' => "OrderCycle.showProducts['outgoing']"}= t(:expand_all)
%th{ ng: { if: 'enterprises[exchange.enterprise_id].managed || order_cycle.viewing_as_coordinator' } }
%th{ "ng-if" => 'enterprises[exchange.enterprise_id].managed || order_cycle.viewing_as_coordinator' }
= t('.tags')
%th= t('.delivery_details')
%th= t('.fees')

6
app/views/admin/product_import/_entries_table.html.haml
View File

@@ -5,10 +5,10 @@
%th #{t('admin.product_import.import.line')}
- @importer.table_headings.each do |heading|
%th= heading
%tr{ng: {repeat: "(line_number, entry) in (entries | entriesFilterValid:'#{entries}')"}}
%tr{ "ng-repeat" => "(line_number, entry) in (entries | entriesFilterValid:'#{entries}')" }
%td
%i{ng: {class: "{'fa fa-warning error': (count(entry.errors) > 0), 'fa fa-check-circle success': (count(entry.errors) == 0)}"}}
%i{ "ng-class" => "{'fa fa-warning error': (count(entry.errors) > 0), 'fa fa-check-circle success': (count(entry.errors) == 0)}" }
%td
{{line_number}}
%td{ng: {repeat: "(attribute, value) in entry.attributes", class: "{'invalid': attribute_invalid(attribute, line_number)}"}}
%td{ "ng-repeat" => "(attribute, value) in entry.attributes", "ng-class" => "{'invalid': attribute_invalid(attribute, line_number)}" }
{{value}}

6
app/views/admin/product_import/_errors_list.html.haml
View File

@@ -1,9 +1,9 @@
%div.import-errors{ng: {controller: 'ImportFeedbackCtrl', repeat: "(line_number, entry ) in (entries | entriesFilterValid:'invalid')"}}
%div.import-errors{ "ng-controller" => 'ImportFeedbackCtrl', "ng-repeat" => "(line_number, entry ) in (entries | entriesFilterValid:'invalid')" }
%p.line
%strong
#{t('admin.product_import.import.item_line')} {{line_number}}:
%span {{entry.attributes.name}}
%span{ng: {if: "entry.attributes.display_name"}}
%span{ "ng-if" => "entry.attributes.display_name" }
( {{entry.attributes.display_name}} )
%p.error{ng: {repeat: "(attribute, error) in entry.errors", show: "ignore_fields.indexOf(attribute) < 0" }}
%p.error{ "ng-repeat" => "(attribute, error) in entry.errors", "ng-show" => "ignore_fields.indexOf(attribute) < 0" }
&nbsp;-&nbsp; {{error}}

2
app/views/admin/product_import/_import_options.html.haml
View File

@@ -4,7 +4,7 @@
- @importer.enterprises_index.each do |name, attrs|
- if name and attrs[:id] and @importer.permission_by_id?(attrs[:id])
%div.panel-section.import-settings
%div.panel-header{ng: {click: 'togglePanel()', class: '{active: active}'}}
%div.panel-header{ "ng-click" => 'togglePanel()', "ng-class" => '{active: active}' }
%div.header-icon.success
%i.fa.fa-check-circle
%div.header-description

52
app/views/admin/product_import/_import_review.html.haml
View File

@@ -1,7 +1,7 @@
%h5= t('admin.product_import.import.validation_overview')
%br
%div{ng: {controller: 'ImportFeedbackCtrl'}}
%div{ "ng-controller" => 'ImportFeedbackCtrl' }
- if @importer.product_field_errors?
.alert-box.warning
@@ -9,10 +9,10 @@
%em= @non_updatable_fields.keys.join(', ') + "."
= t('.fields_ignored')
%div.panel-section{ng: {controller: 'DropdownPanelsCtrl'}}
%div.panel-header{ng: {click: 'togglePanel()', class: '{active: active && count((entries | entriesFilterValid:"all"))}'}}
%div.panel-section{ "ng-controller" => 'DropdownPanelsCtrl' }
%div.panel-header{ "ng-click" => 'togglePanel()', "ng-class" => '{active: active && count((entries | entriesFilterValid:"all"))}' }
%div.header-caret
%i{ng: {class: "{'icon-chevron-down': active, 'icon-chevron-right': !active}", hide: 'count((entries | entriesFilterValid:"all")) == 0'}}
%i{ "ng-class" => "{'icon-chevron-down': active, 'icon-chevron-right': !active}", "ng-hide" => 'count((entries | entriesFilterValid:"all")) == 0' }
%div.header-icon.success
%i.fa.fa-info-circle.info
%div.header-count
@@ -20,13 +20,13 @@
{{ count((entries | entriesFilterValid:"all")) }}
%div.header-description
= t('admin.product_import.import.entries_found')
%div.panel-content{ng: {hide: '!active || count((entries | entriesFilterValid:"all")) == 0'}}
%div.panel-content{ "ng-hide" => '!active || count((entries | entriesFilterValid:"all")) == 0' }
= render 'entries_table', entries: 'all'
%div.panel-section{ng: {controller: 'DropdownPanelsCtrl', hide: 'count((entries | entriesFilterValid:"invalid")) == 0'}}
%div.panel-header{ng: {click: 'togglePanel()', class: '{active: active && count((entries | entriesFilterValid:"invalid"))}'}}
%div.panel-section{ "ng-controller" => 'DropdownPanelsCtrl', "ng-hide" => 'count((entries | entriesFilterValid:"invalid")) == 0' }
%div.panel-header{ "ng-click" => 'togglePanel()', "ng-class" => '{active: active && count((entries | entriesFilterValid:"invalid"))}' }
%div.header-caret
%i{ng: {class: "{'icon-chevron-down': active, 'icon-chevron-right': !active}", hide: 'count((entries | entriesFilterValid:"invalid")) == 0'}}
%i{ "ng-class" => "{'icon-chevron-down': active, 'icon-chevron-right': !active}", "ng-hide" => 'count((entries | entriesFilterValid:"invalid")) == 0' }
%div.header-icon.error
%i.fa.fa-warning
%div.header-count
@@ -34,15 +34,15 @@
{{ count((entries | entriesFilterValid:"invalid")) }}
%div.header-description
= t('admin.product_import.import.entries_with_errors')
%div.panel-content{ng: {hide: '!active || count((entries | entriesFilterValid:"invalid")) == 0'}}
%div.panel-content{ "ng-hide" => '!active || count((entries | entriesFilterValid:"invalid")) == 0' }
= render 'errors_list'
%br
= render 'entries_table', entries: 'invalid'
%div.panel-section{ng: {controller: 'DropdownPanelsCtrl', hide: 'count((entries | entriesFilterValid:"create_product")) == 0'}}
%div.panel-header{ng: {click: 'togglePanel()', class: '{active: active && count((entries | entriesFilterValid:"create_product"))}'}}
%div.panel-section{ "ng-controller" => 'DropdownPanelsCtrl', "ng-hide" => 'count((entries | entriesFilterValid:"create_product")) == 0' }
%div.panel-header{ "ng-click" => 'togglePanel()', "ng-class" => '{active: active && count((entries | entriesFilterValid:"create_product"))}' }
%div.header-caret
%i{ng: {class: "{'icon-chevron-down': active, 'icon-chevron-right': !active}", hide: 'count((entries | entriesFilterValid:"create_product")) == 0'}}
%i{ "ng-class" => "{'icon-chevron-down': active, 'icon-chevron-right': !active}", "ng-hide" => 'count((entries | entriesFilterValid:"create_product")) == 0' }
%div.header-icon.success
%i.fa.fa-check-circle
%div.header-count
@@ -50,13 +50,13 @@
{{ count((entries | entriesFilterValid:"create_product")) }}
%div.header-description
= t('admin.product_import.import.products_to_create')
%div.panel-content{ng: {hide: '!active || count((entries | entriesFilterValid:"create_product")) == 0'}}
%div.panel-content{ "ng-hide" => '!active || count((entries | entriesFilterValid:"create_product")) == 0' }
= render 'entries_table', entries: 'create_product'
%div.panel-section{ng: {controller: 'DropdownPanelsCtrl', hide: 'count((entries | entriesFilterValid:"update_product")) == 0'}}
%div.panel-header{ng: {click: 'togglePanel()', class: '{active: active && count((entries | entriesFilterValid:"update_product"))}'}}
%div.panel-section{ "ng-controller" => 'DropdownPanelsCtrl', "ng-hide" => 'count((entries | entriesFilterValid:"update_product")) == 0' }
%div.panel-header{ "ng-click" => 'togglePanel()', "ng-class" => '{active: active && count((entries | entriesFilterValid:"update_product"))}' }
%div.header-caret
%i{ng: {class: "{'icon-chevron-down': active, 'icon-chevron-right': !active}", hide: 'count((entries | entriesFilterValid:"update_product")) == 0'}}
%i{ "ng-class" => "{'icon-chevron-down': active, 'icon-chevron-right': !active}", "ng-hide" => 'count((entries | entriesFilterValid:"update_product")) == 0' }
%div.header-icon.success
%i.fa.fa-check-circle
%div.header-count
@@ -64,13 +64,13 @@
{{ count((entries | entriesFilterValid:"update_product")) }}
%div.header-description
= t('admin.product_import.import.products_to_update')
%div.panel-content{ng: {hide: '!active || count((entries | entriesFilterValid:"update_product")) == 0'}}
%div.panel-content{ "ng-hide" => '!active || count((entries | entriesFilterValid:"update_product")) == 0' }
= render 'entries_table', entries: 'update_product'
%div.panel-section{ng: {controller: 'DropdownPanelsCtrl', hide: 'count((entries | entriesFilterValid:"create_inventory")) == 0'}}
%div.panel-header{ng: {click: 'togglePanel()', class: '{active: active && count((entries | entriesFilterValid:"create_inventory"))}'}}
%div.panel-section{ "ng-controller" => 'DropdownPanelsCtrl', "ng-hide" => 'count((entries | entriesFilterValid:"create_inventory")) == 0' }
%div.panel-header{ "ng-click" => 'togglePanel()', "ng-class" => '{active: active && count((entries | entriesFilterValid:"create_inventory"))}' }
%div.header-caret
%i{ng: {class: "{'icon-chevron-down': active, 'icon-chevron-right': !active}", hide: 'count((entries | entriesFilterValid:"create_inventory")) == 0'}}
%i{ "ng-class" => "{'icon-chevron-down': active, 'icon-chevron-right': !active}", "ng-hide" => 'count((entries | entriesFilterValid:"create_inventory")) == 0' }
%div.header-icon.success
%i.fa.fa-check-circle
%div.header-count
@@ -78,13 +78,13 @@
{{ count((entries | entriesFilterValid:"create_inventory")) }}
%div.header-description
= t('admin.product_import.import.inventory_to_create')
%div.panel-content{ng: {hide: '!active || count((entries | entriesFilterValid:"create_inventory")) == 0'}}
%div.panel-content{ "ng-hide" => '!active || count((entries | entriesFilterValid:"create_inventory")) == 0' }
= render 'entries_table', entries: 'create_inventory'
%div.panel-section{ng: {controller: 'DropdownPanelsCtrl', hide: 'count((entries | entriesFilterValid:"update_inventory")) == 0'}}
%div.panel-header{ng: {click: 'togglePanel()', class: '{active: active && count((entries | entriesFilterValid:"update_inventory"))}'}}
%div.panel-section{ "ng-controller" => 'DropdownPanelsCtrl', "ng-hide" => 'count((entries | entriesFilterValid:"update_inventory")) == 0' }
%div.panel-header{ "ng-click" => 'togglePanel()', "ng-class" => '{active: active && count((entries | entriesFilterValid:"update_inventory"))}' }
%div.header-caret
%i{ng: {class: "{'icon-chevron-down': active, 'icon-chevron-right': !active}", hide: 'count((entries | entriesFilterValid:"update_inventory")) == 0'}}
%i{ "ng-class" => "{'icon-chevron-down': active, 'icon-chevron-right': !active}", "ng-hide" => 'count((entries | entriesFilterValid:"update_inventory")) == 0' }
%div.header-icon.success
%i.fa.fa-check-circle
%div.header-count
@@ -92,10 +92,10 @@
{{ count((entries | entriesFilterValid:"update_inventory")) }}
%div.header-description
= t('admin.product_import.import.inventory_to_update')
%div.panel-content{ng: {hide: '!active || count((entries | entriesFilterValid:"update_inventory")) == 0'}}
%div.panel-content{ "ng-hide" => '!active || count((entries | entriesFilterValid:"update_inventory")) == 0' }
= render 'entries_table', entries: 'update_inventory'
%div.panel-section{ng: {controller: 'ImportOptionsFormCtrl', hide: 'resetTotal == 0'}}
%div.panel-section{ "ng-controller" => 'ImportOptionsFormCtrl', "ng-hide" => 'resetTotal == 0' }
%div.panel-header
%div.header-caret
%div.header-icon.info

30
app/views/admin/product_import/_save_results.html.haml
View File

@@ -4,31 +4,31 @@
%div.post-save-results
%p{ng: {show: 'updates.products_created'}}
%i.fa{ng: {class: "{'fa-info-circle': updates.products_created == 0, 'fa-check-circle': updates.products_created > 0}"}}
%p{ "ng-show" => 'updates.products_created' }
%i.fa{ "ng-class" => "{'fa-info-circle': updates.products_created == 0, 'fa-check-circle': updates.products_created > 0}" }
%strong.created-count
{{ updates.products_created }}
= t('.products_created')
%p{ng: {show: 'updates.products_updated'}}
%i.fa{ng: {class: "{'fa-info-circle': updates.products_updated == 0, 'fa-check-circle': updates.products_updated > 0}"}}
%p{ "ng-show" => 'updates.products_updated' }
%i.fa{ "ng-class" => "{'fa-info-circle': updates.products_updated == 0, 'fa-check-circle': updates.products_updated > 0}" }
%strong.updated-count
{{ updates.products_updated }}
= t('.products_updated')
%p{ng: {show: 'updates.inventory_created'}}
%i.fa{ng: {class: "{'fa-info-circle': updates.inventory_created == 0, 'fa-check-circle': updates.inventory_created > 0}"}}
%p{ "ng-show" => 'updates.inventory_created' }
%i.fa{ "ng-class" => "{'fa-info-circle': updates.inventory_created == 0, 'fa-check-circle': updates.inventory_created > 0}" }
%strong.inv-created-count
{{ updates.inventory_created }}
= t('.inventory_created')
%p{ng: {show: 'updates.inventory_updated'}}
%i.fa{ng: {class: "{'fa-info-circle': updates.inventory_updated == 0, 'fa-check-circle': updates.inventory_updated > 0}"}}
%p{ "ng-show" => 'updates.inventory_updated' }
%i.fa{ "ng-class" => "{'fa-info-circle': updates.inventory_updated == 0, 'fa-check-circle': updates.inventory_updated > 0}" }
%strong.inv-updated-count
{{ updates.inventory_updated }}
= t('.inventory_updated')
%p{ng: {show: 'updates.products_reset'}}
%p{ "ng-show" => 'updates.products_reset' }
%i.fa.fa-info-circle
%strong.reset-count
{{ updates.products_reset }}
@@ -39,24 +39,24 @@
%br
%p{ng: {show: 'update_errors.length == 0'}}
%p{ "ng-show" => 'update_errors.length == 0' }
= t('.all_saved')
%div{ng: {show: 'update_errors.length > 0'}}
%div{ "ng-show" => 'update_errors.length > 0' }
%p {{ updated_total }} #{t('.some_saved')}
%br
%h5= t('.save_errors')
%p.save-error{ng: {repeat: 'error in update_errors'}}
%p.save-error{ "ng-repeat" => 'error in update_errors' }
&nbsp;-&nbsp; {{ error }}
%br
%div{ng: {show: 'updated_total > 0'}}
%a.button.view{href: main_app.admin_inventory_path, ng: {show: 'updates.inventory_created > 0 || updates.inventory_updated > 0'}}
%div{ "ng-show" => 'updated_total > 0' }
%a.button.view{ "href" => main_app.admin_inventory_path, "ng-show" => 'updates.inventory_created > 0 || updates.inventory_updated > 0' }
= t('.view_inventory')
%a.button.view{href: admin_products_path, ng: {show: 'updates.products_created > 0 || updates.products_updated > 0'}}
%a.button.view{ "href" => admin_products_path, "ng-show" => 'updates.products_created > 0 || updates.products_updated > 0' }
= t('.view_products')
%a.button{href: main_app.admin_product_import_path}

2
app/views/admin/product_import/_upload_form.html.haml
View File

@@ -1,4 +1,4 @@
%div{ng: {app: 'admin.productImport', controller: 'ImportOptionsFormCtrl', init: "initForm()"}}
%div{ "ng-app" => 'admin.productImport', "ng-controller" => 'ImportOptionsFormCtrl', "ng-init" => "initForm()" }
= form_tag main_app.admin_product_import_path, multipart: true, class: 'product-import' do

24
app/views/admin/product_import/import.html.haml
View File

@@ -4,7 +4,7 @@
= render partial: 'ams_data'
= render partial: 'spree/admin/shared/product_sub_menu'
.import-wrapper{ng: {app: 'admin.productImport', controller: 'ImportFormCtrl'}}
.import-wrapper{ "ng-app" => 'admin.productImport', "ng-controller" => 'ImportFormCtrl' }
- if @importer.item_count == 0
%h5
@@ -13,14 +13,14 @@
= t('.none_to_save')
%br
- else
.settings-section{ng: {show: 'step == "settings"'}}
.settings-section{ "ng-show" => 'step == "settings"' }
= render 'import_options' if @importer.table_headings
%br
%a.button.proceed{href: '', ng: {click: 'confirmSettings()'}}
%a.button.proceed{ "href" => '', "ng-click" => 'confirmSettings()' }
= t('.import')
%a.button{href: main_app.admin_product_import_path} #{t('admin.cancel')}
.progress-interface{ng: {show: 'step == "import"'}}
.progress-interface{ "ng-show" => 'step == "import"' }
%span.filename
= @original_filename
%span.percentage
@@ -34,12 +34,12 @@
= render 'import_review' if @importer.table_headings
%div{ng: {controller: 'ImportFeedbackCtrl', show: 'count((entries | entriesFilterValid:"valid")) > 0'}}
%div{ng: {if: 'count((entries | entriesFilterValid:"invalid")) > 0'}}
%div{ "ng-controller" => 'ImportFeedbackCtrl', "ng-show" => 'count((entries | entriesFilterValid:"valid")) > 0' }
%div{ "ng-if" => 'count((entries | entriesFilterValid:"invalid")) > 0' }
%br
%h5= t('admin.product_import.import.some_invalid_entries')
%p= t('admin.product_import.import.fix_before_import')
%div{ng: {show: 'count((entries | entriesFilterValid:"invalid")) == 0'}}
%div{ "ng-show" => 'count((entries | entriesFilterValid:"invalid")) == 0' }
%br
%h5= t('.no_errors')
%p= t('.save_all_imported?')
@@ -47,22 +47,22 @@
= hidden_field_tag :filepath, @filepath
= hidden_field_tag "settings[import_into]", @import_into
%a.button.proceed{href: '', ng: {show: 'count((entries | entriesFilterValid:"invalid")) == 0', click: 'acceptResults()'}}
%a.button.proceed{ "href" => '', "ng-show" => 'count((entries | entriesFilterValid:"invalid")) == 0', "ng-click" => 'acceptResults()' }
= t('.save')
%a.button{href: main_app.admin_product_import_path}= t('admin.cancel')
%div{ng: {controller: 'ImportFeedbackCtrl', show: 'count((entries | entriesFilterValid:"valid")) == 0'}}
%div{ "ng-controller" => 'ImportFeedbackCtrl', "ng-show" => 'count((entries | entriesFilterValid:"valid")) == 0' }
%br
%a.button{href: main_app.admin_product_import_path}= t('admin.cancel')
.progress-interface{ng: {show: 'step == "save"'}}
.progress-interface{ "ng-show" => 'step == "save"' }
%span.filename
#{t('.save_imported')} ({{ percentage.save }})
.progress-bar{}
%span.progress-track{ng: {style: "{'width': percentage.save }"}}
%span.progress-track{ "ng-style" => "{'width': percentage.save }" }
%p.red
{{ exception }}
.save-results{ng: {show: 'step == "complete"'}}
.save-results{ "ng-show" => 'step == "complete"' }
= render 'save_results'

2
app/views/admin/products_v3/_no_products.html.haml
View File

@@ -1,6 +1,6 @@
- if search_term.present? || producer_id.present? || category_id.present?
= t('.no_products_found_for_search')
%a{ href: "#", class: "button disruptive relaxed", data: { reflex: "click->products#clear_search" } }
%a{ "href" => "#", "class" => "button disruptive relaxed", "data-reflex" => "click->products#clear_search" }
= t("admin.products_v3.sort.pagination.clear_search")
- else
= t('.no_products_found')

2
app/views/admin/products_v3/_sort.html.haml
View File

@@ -2,7 +2,7 @@
%div
= t(".pagination.total_html", total: pagy.count, from: pagy.from, to: pagy.to)
- if search_term.present? || producer_id.present? || category_id.present?
%a{ href: "#", class: "button disruptive", data: { reflex: "click->products#clear_search" } }
%a{ "href" => "#", "class" => "button disruptive", "data-reflex" => "click->products#clear_search" }
= t(".pagination.clear_search")
%form.with-dropdown
= t(".pagination.per_page.show")

2
app/views/admin/reports/show.html.haml
View File

@@ -27,5 +27,5 @@
= t(@error, link: link_to(t(".report_link_label"), @error_url)) if @error
#report-table{ data: { controller: "scoped-channel", "scoped-channel-id-value": request.uuid } }
#report-table{ "data-controller" => "scoped-channel", "data-scoped-channel-id-value" => request.uuid }
= @table

4
app/views/admin/shared/_side_menu.html.haml
View File

@@ -2,12 +2,12 @@
- if @enterprise
- enterprise_side_menu_items(@enterprise).each do |item|
- next if !item[:show]
%a.menu_item{ href: item[:href] || "##{item[:name]}_panel", data: { action: "tabs-and-panels#activate", "tabs-and-panels-target": "tab", test: "link_for_#{item[:name]}" }, class: item[:selected] }
%a.menu_item{ "href" => item[:href] || "##{item[:name]}_panel", "class" => item[:selected], "data-action" => "tabs-and-panels#activate", "data-tabs-and-panels-target" => "tab", "data-test" => "link_for_#{item[:name]}" }
%i{ class: item[:icon_class] }
%span= t(".enterprise.#{item[:name] }")
- else
- enterprise_group_side_menu_items.each do |item|
%a.menu_item{ href: "##{item[:name]}_panel", class: item[:selected], data: { action: "tabs-and-panels#activate", "tabs-and-panels-target": "tab", test: "link_for_#{item[:name]}" } }
%a.menu_item{ "href" => "##{item[:name]}_panel", "class" => item[:selected], "data-action" => "tabs-and-panels#activate", "data-tabs-and-panels-target" => "tab", "data-test" => "link_for_#{item[:name]}" }
%i{ class: item[:icon_class] }
%span= t(".enterprise_group.#{item[:name] }")

10
app/views/admin/shared/_stimulus_pagination.html.haml
View File

@@ -2,9 +2,9 @@
.pagination{ "data-controller": "search" }
- if pagy.prev
%button.page.prev{ data: { action: 'click->search#changePage', page: pagy.prev } }
%button.page.prev{ "data-action" => 'click->search#changePage', "data-page" => pagy.prev }
- if feature?(:admin_style_v3, spree_current_user)
%i.icon-chevron-left{ data: { action: 'click->search#changePage', page: pagy.prev } }
%i.icon-chevron-left{ "data-action" => 'click->search#changePage', "data-page" => pagy.prev }
- else
!= pagy_t('pagy.nav.prev')
- else
@@ -12,7 +12,7 @@
- pagy.series.each do |item| # series example: [1, :gap, 7, 8, "9", 10, 11, :gap, 36]
- if item.is_a?(Integer) # page link
%button.page{ data: { action: 'click->search#changePage', page: item } }= item
%button.page{ "data-action" => 'click->search#changePage', "data-page" => item }= item
- elsif item.is_a?(String) # current page
%button.page.current.active= item
@@ -21,9 +21,9 @@
%span.page.gap.pagination-ellipsis!= pagy_t('pagy.nav.gap')
- if pagy.next
%button.page.next{ data: { action: 'click->search#changePage', page: pagy.next } }
%button.page.next{ "data-action" => 'click->search#changePage', "data-page" => pagy.next }
- if feature?(:admin_style_v3, spree_current_user)
%i.icon-chevron-right{ data: { action: 'click->search#changePage', page: pagy.next } }
%i.icon-chevron-right{ "data-action" => 'click->search#changePage', "data-page" => pagy.next }
- else
!= pagy_t('pagy.nav.next')
- else

2
app/views/admin/shared/_views_dropdown.html.haml
View File

@@ -2,6 +2,6 @@
%span{ :class => 'icon-eye-open' }= "&nbsp; #{t('admin.viewing', current_view_name: '{{ currentView().name }}')}".html_safe
%span{ 'ng-class' => "expanded && 'icon-caret-up' || !expanded && 'icon-caret-down'" }
%div.menu{ 'ng-show' => "expanded" }
%div.menu_item{ ng: { repeat: "(viewKey, view) in views" }, toggle: { view: true }, 'close-on-click' => true }
%div.menu_item{ "close-on-click" => true, "ng-repeat" => "(viewKey, view) in views", "toggle-view" => true }
%span.check
%span.name {{ view.name }}

98
app/views/admin/subscriptions/_address.html.haml
View File

@@ -4,48 +4,48 @@
%legend{ align: 'center'}= t(:bill_address)
.field
%label{ for: 'bill_address_firstname'}= t(:first_name)
%input.fullwidth#bill_address_firstname{ name: 'bill_address_firstname', type: 'text', required: true, ng: { model: "subscription.bill_address.firstname" } }
.error{ ng: { show: 'subscription_form.$submitted && subscription_address_form.bill_address_firstname.$error.required' } }= t(:error_required)
.error{ ng: { repeat: "error in errors['bill_address.firstname']", show: 'subscription_address_form.bill_address_firstname.$pristine' } } {{ error }}
%input.fullwidth#bill_address_firstname{ "name" => 'bill_address_firstname', "type" => 'text', "required" => true, "ng-model" => "subscription.bill_address.firstname" }
.error{ "ng-show" => 'subscription_form.$submitted && subscription_address_form.bill_address_firstname.$error.required' }= t(:error_required)
.error{ "ng-repeat" => "error in errors['bill_address.firstname']", "ng-show" => 'subscription_address_form.bill_address_firstname.$pristine' } {{ error }}
.field
%label{ for: 'bill_address_lastname'}= t(:last_name)
%input.fullwidth#bill_address_lastname{ name: 'bill_address_lastname', type: 'text', required: true, ng: { model: "subscription.bill_address.lastname" } }
.error{ ng: { show: 'subscription_form.$submitted && subscription_address_form.bill_address_lastname.$error.required' } }= t(:error_required)
.error{ ng: { repeat: "error in errors['bill_address.lastname']", show: 'subscription_address_form.bill_address_lastname.$pristine' } } {{ error }}
%input.fullwidth#bill_address_lastname{ "name" => 'bill_address_lastname', "type" => 'text', "required" => true, "ng-model" => "subscription.bill_address.lastname" }
.error{ "ng-show" => 'subscription_form.$submitted && subscription_address_form.bill_address_lastname.$error.required' }= t(:error_required)
.error{ "ng-repeat" => "error in errors['bill_address.lastname']", "ng-show" => 'subscription_address_form.bill_address_lastname.$pristine' } {{ error }}
.field
%label{ for: 'bill_address_address1'}= t(:address)
%input.fullwidth#bill_address_address1{ name: 'bill_address_address1', type: 'text', required: true, ng: { model: "subscription.bill_address.address1" } }
.error{ ng: { show: 'subscription_form.$submitted && subscription_address_form.bill_address_address1.$error.required' } }= t(:error_required)
.error{ ng: { repeat: "error in errors['bill_address.address1']", show: 'subscription_address_form.bill_address_address1.$pristine' } } {{ error }}
%input.fullwidth#bill_address_address1{ "name" => 'bill_address_address1', "type" => 'text', "required" => true, "ng-model" => "subscription.bill_address.address1" }
.error{ "ng-show" => 'subscription_form.$submitted && subscription_address_form.bill_address_address1.$error.required' }= t(:error_required)
.error{ "ng-repeat" => "error in errors['bill_address.address1']", "ng-show" => 'subscription_address_form.bill_address_address1.$pristine' } {{ error }}
.field
%label{ for: 'bill_address_city'}= t(:suburb)
%input.fullwidth#bill_address_city{ name: 'bill_address_city', type: 'text', required: true, ng: { model: "subscription.bill_address.city" } }
.error{ ng: { show: 'subscription_form.$submitted && subscription_address_form.bill_address_city.$error.required' } }= t(:error_required)
.error{ ng: { repeat: 'error in errors.bill_address.city', show: 'subscription_address_form.bill_address_city.$pristine' } } {{ error }}
%input.fullwidth#bill_address_city{ "name" => 'bill_address_city', "type" => 'text', "required" => true, "ng-model" => "subscription.bill_address.city" }
.error{ "ng-show" => 'subscription_form.$submitted && subscription_address_form.bill_address_city.$error.required' }= t(:error_required)
.error{ "ng-repeat" => 'error in errors.bill_address.city', "ng-show" => 'subscription_address_form.bill_address_city.$pristine' } {{ error }}
.field
%label{ for: "bill_address_zipcode"}= t(:postcode)
%input.fullwidth#bill_address_zipcode{ name: 'bill_address_zipcode', type: 'text', required: true, ng: { model: "subscription.bill_address.zipcode" } }
.error{ ng: { show: 'subscription_form.$submitted && subscription_address_form.bill_address_zipcode.$error.required' } }= t(:error_required)
.error{ ng: { repeat: 'error in errors.bill_address.zipcode', show: 'subscription_address_form.bill_address_zipcode.$pristine' } } {{ error }}
%input.fullwidth#bill_address_zipcode{ "name" => 'bill_address_zipcode', "type" => 'text', "required" => true, "ng-model" => "subscription.bill_address.zipcode" }
.error{ "ng-show" => 'subscription_form.$submitted && subscription_address_form.bill_address_zipcode.$error.required' }= t(:error_required)
.error{ "ng-repeat" => 'error in errors.bill_address.zipcode', "ng-show" => 'subscription_address_form.bill_address_zipcode.$pristine' } {{ error }}
.field
%label{ for: "bill_address_phone"}= t(:phone)
%input.fullwidth#bill_address_phone{ name: 'bill_address_phone', type: 'text', required: true, ng: { model: "subscription.bill_address.phone" } }
.error{ ng: { show: 'subscription_form.$submitted && subscription_address_form.bill_address_phone.$error.required' } }= t(:error_required)
.error{ ng: { repeat: 'error in errors.bill_address.phone', show: 'subscription_address_form.bill_address_phone.$pristine' } } {{ error }}
%input.fullwidth#bill_address_phone{ "name" => 'bill_address_phone', "type" => 'text', "required" => true, "ng-model" => "subscription.bill_address.phone" }
.error{ "ng-show" => 'subscription_form.$submitted && subscription_address_form.bill_address_phone.$error.required' }= t(:error_required)
.error{ "ng-repeat" => 'error in errors.bill_address.phone', "ng-show" => 'subscription_address_form.bill_address_phone.$pristine' } {{ error }}
.field
%label{ for: "bill_address_country_id"}= t(:country)
%input.ofn-select2.fullwidth#bill_address_country_id{ name: 'bill_address_country_id', type: 'number', data: 'countries', required: true, placeholder: t('admin.choose'), ng: { model: 'subscription.bill_address.country_id' } }
.error{ ng: { show: 'subscription_form.$submitted && subscription_address_form.bill_address_country_id.$error.required' } }= t(:error_required)
.error{ ng: { repeat: 'error in errors.bill_address.country', show: 'subscription_address_form.bill_address_country_id.$pristine' } } {{ error }}
%input.ofn-select2.fullwidth#bill_address_country_id{ "name" => 'bill_address_country_id', "type" => 'number', "data" => 'countries', "required" => true, "placeholder" => t('admin.choose'), "ng-model" => 'subscription.bill_address.country_id' }
.error{ "ng-show" => 'subscription_form.$submitted && subscription_address_form.bill_address_country_id.$error.required' }= t(:error_required)
.error{ "ng-repeat" => 'error in errors.bill_address.country', "ng-show" => 'subscription_address_form.bill_address_country_id.$pristine' } {{ error }}
.field
%label{ for: "bill_address_state_id"}= t(:state)
%input.ofn-select2.fullwidth#bill_address_state_id{ name: 'bill_address_state_id', type: 'number', data: 'billStates', required: true, placeholder: t('admin.choose'), ng: { model: 'subscription.bill_address.state_id' } }
.error{ ng: { show: 'subscription_form.$submitted && subscription_address_form.bill_address_state_id.$error.required' } }= t(:error_required)
.error{ ng: { repeat: 'error in errors.bill_address.state', show: 'subscription_address_form.bill_address_state_id.$pristine' } } {{ error }}
%input.ofn-select2.fullwidth#bill_address_state_id{ "name" => 'bill_address_state_id', "type" => 'number', "data" => 'billStates', "required" => true, "placeholder" => t('admin.choose'), "ng-model" => 'subscription.bill_address.state_id' }
.error{ "ng-show" => 'subscription_form.$submitted && subscription_address_form.bill_address_state_id.$error.required' }= t(:error_required)
.error{ "ng-repeat" => 'error in errors.bill_address.state', "ng-show" => 'subscription_address_form.bill_address_state_id.$pristine' } {{ error }}
.two.columns
%a.button.red.fullwidth{ href: 'javascript:void(0)', ng: { click: 'shipAddressFromBilling()' } }
%a.button.red.fullwidth{ "href" => 'javascript:void(0)', "ng-click" => 'shipAddressFromBilling()' }
= t('copy')
%i.icon-chevron-right
.seven.columns.omega
@@ -53,41 +53,41 @@
%legend{ align: 'center'}= t(:ship_address)
.field
%label{ for: 'ship_address_firstname'}= t(:first_name)
%input.fullwidth#ship_address_firstname{ name: 'ship_address_firstname', type: 'text', required: true, ng: { model: "subscription.ship_address.firstname" } }
.error{ ng: { show: 'subscription_form.$submitted && subscription_address_form.ship_address_firstname.$error.required' } }= t(:error_required)
.error{ ng: { repeat: "error in errors['ship_address.firstname']", show: 'subscription_address_form.ship_address_firstname.$pristine' } } {{ error }}
%input.fullwidth#ship_address_firstname{ "name" => 'ship_address_firstname', "type" => 'text', "required" => true, "ng-model" => "subscription.ship_address.firstname" }
.error{ "ng-show" => 'subscription_form.$submitted && subscription_address_form.ship_address_firstname.$error.required' }= t(:error_required)
.error{ "ng-repeat" => "error in errors['ship_address.firstname']", "ng-show" => 'subscription_address_form.ship_address_firstname.$pristine' } {{ error }}
.field
%label{ for: 'ship_address_lastname'}= t(:last_name)
%input.fullwidth#ship_address_lastname{ name: 'ship_address_lastname', type: 'text', required: true, ng: { model: "subscription.ship_address.lastname" } }
.error{ ng: { show: 'subscription_form.$submitted && subscription_address_form.ship_address_lastname.$error.required' } }= t(:error_required)
.error{ ng: { repeat: "error in errors['ship_address.lastname']", show: 'subscription_address_form.ship_address_lastname.$pristine' } } {{ error }}
%input.fullwidth#ship_address_lastname{ "name" => 'ship_address_lastname', "type" => 'text', "required" => true, "ng-model" => "subscription.ship_address.lastname" }
.error{ "ng-show" => 'subscription_form.$submitted && subscription_address_form.ship_address_lastname.$error.required' }= t(:error_required)
.error{ "ng-repeat" => "error in errors['ship_address.lastname']", "ng-show" => 'subscription_address_form.ship_address_lastname.$pristine' } {{ error }}
.field
%label{ for: 'ship_address_address1'}= t(:address)
%input.fullwidth#ship_address_address1{ name: 'ship_address_address1', type: 'text', required: true, ng: { model: "subscription.ship_address.address1" } }
.error{ ng: { show: 'subscription_form.$submitted && subscription_address_form.ship_address_address1.$error.required' } }= t(:error_required)
.error{ ng: { repeat: "error in errors['ship_address.address1']", show: 'subscription_address_form.ship_address_address1.$pristine' } } {{ error }}
%input.fullwidth#ship_address_address1{ "name" => 'ship_address_address1', "type" => 'text', "required" => true, "ng-model" => "subscription.ship_address.address1" }
.error{ "ng-show" => 'subscription_form.$submitted && subscription_address_form.ship_address_address1.$error.required' }= t(:error_required)
.error{ "ng-repeat" => "error in errors['ship_address.address1']", "ng-show" => 'subscription_address_form.ship_address_address1.$pristine' } {{ error }}
.field
%label{ for: 'ship_address_city'}= t(:suburb)
%input.fullwidth#ship_address_city{ name: 'ship_address_city', type: 'text', required: true, ng: { model: "subscription.ship_address.city" } }
.error{ ng: { show: 'subscription_form.$submitted && subscription_address_form.ship_address_city.$error.required' } }= t(:error_required)
.error{ ng: { repeat: 'error in errors.ship_address.city', show: 'subscription_address_form.ship_address_city.$pristine' } } {{ error }}
%input.fullwidth#ship_address_city{ "name" => 'ship_address_city', "type" => 'text', "required" => true, "ng-model" => "subscription.ship_address.city" }
.error{ "ng-show" => 'subscription_form.$submitted && subscription_address_form.ship_address_city.$error.required' }= t(:error_required)
.error{ "ng-repeat" => 'error in errors.ship_address.city', "ng-show" => 'subscription_address_form.ship_address_city.$pristine' } {{ error }}
.field
%label{ for: "ship_address_zipcode"}= t(:postcode)
%input.fullwidth#ship_address_zipcode{ name: 'ship_address_zipcode', type: 'text', required: true, ng: { model: "subscription.ship_address.zipcode" } }
.error{ ng: { show: 'subscription_form.$submitted && subscription_address_form.ship_address_zipcode.$error.required' } }= t(:error_required)
.error{ ng: { repeat: 'error in errors.ship_address.zipcode', show: 'subscription_address_form.ship_address_zipcode.$pristine' } } {{ error }}
%input.fullwidth#ship_address_zipcode{ "name" => 'ship_address_zipcode', "type" => 'text', "required" => true, "ng-model" => "subscription.ship_address.zipcode" }
.error{ "ng-show" => 'subscription_form.$submitted && subscription_address_form.ship_address_zipcode.$error.required' }= t(:error_required)
.error{ "ng-repeat" => 'error in errors.ship_address.zipcode', "ng-show" => 'subscription_address_form.ship_address_zipcode.$pristine' } {{ error }}
.field
%label{ for: "ship_address_phone"}= t(:phone)
%input.fullwidth#ship_address_phone{ name: 'ship_address_phone', type: 'text', required: true, ng: { model: "subscription.ship_address.phone" } }
.error{ ng: { show: 'subscription_form.$submitted && subscription_address_form.ship_address_phone.$error.required' } }= t(:error_required)
.error{ ng: { repeat: 'error in errors.ship_address.phone', show: 'subscription_address_form.ship_address_phone.$pristine' } } {{ error }}
%input.fullwidth#ship_address_phone{ "name" => 'ship_address_phone', "type" => 'text', "required" => true, "ng-model" => "subscription.ship_address.phone" }
.error{ "ng-show" => 'subscription_form.$submitted && subscription_address_form.ship_address_phone.$error.required' }= t(:error_required)
.error{ "ng-repeat" => 'error in errors.ship_address.phone', "ng-show" => 'subscription_address_form.ship_address_phone.$pristine' } {{ error }}
.field
%label{ for: "ship_address_country_id"}= t(:country)
%input.ofn-select2.fullwidth#ship_address_country_id{ name: 'ship_address_country_id', type: 'number', data: 'countries', required: true, placeholder: t('admin.choose'), ng: { model: 'subscription.ship_address.country_id' } }
.error{ ng: { show: 'subscription_form.$submitted && subscription_address_form.ship_address_country_id.$error.required' } }= t(:error_required)
.error{ ng: { repeat: 'error in errors.ship_address.country', show: 'subscription_address_form.ship_address_country_id.$pristine' } } {{ error }}
%input.ofn-select2.fullwidth#ship_address_country_id{ "name" => 'ship_address_country_id', "type" => 'number', "data" => 'countries', "required" => true, "placeholder" => t('admin.choose'), "ng-model" => 'subscription.ship_address.country_id' }
.error{ "ng-show" => 'subscription_form.$submitted && subscription_address_form.ship_address_country_id.$error.required' }= t(:error_required)
.error{ "ng-repeat" => 'error in errors.ship_address.country', "ng-show" => 'subscription_address_form.ship_address_country_id.$pristine' } {{ error }}
.field
%label{ for: "ship_address_state_id"}= t(:state)
%input.ofn-select2.fullwidth#ship_address_state_id{ name: 'ship_address_state_id', type: 'number', data: 'shipStates', required: true, placeholder: t('admin.choose'), ng: { model: 'subscription.ship_address.state_id' } }
.error{ ng: { show: 'subscription_form.$submitted && subscription_address_form.ship_address_state_id.$error.required' } }= t(:error_required)
.error{ ng: { repeat: 'error in errors.ship_address.state', show: 'subscription_address_form.ship_address_state_id.$pristine' } } {{ error }}
%input.ofn-select2.fullwidth#ship_address_state_id{ "name" => 'ship_address_state_id', "type" => 'number', "data" => 'shipStates', "required" => true, "placeholder" => t('admin.choose'), "ng-model" => 'subscription.ship_address.state_id' }
.error{ "ng-show" => 'subscription_form.$submitted && subscription_address_form.ship_address_state_id.$error.required' }= t(:error_required)
.error{ "ng-repeat" => 'error in errors.ship_address.state', "ng-show" => 'subscription_address_form.ship_address_state_id.$pristine' } {{ error }}

6
app/views/admin/subscriptions/_autocomplete.html.haml
View File

@@ -9,12 +9,12 @@
%td.vertical-align-top
.field
= label_tag :add_variant_id, t('.name_or_sku')
%input#add_variant_id.variant_autocomplete.fullwidth{ type: 'number', ng: { model: 'newItem.variant_id' } }
%input#add_variant_id.variant_autocomplete.fullwidth{ "type" => 'number', "ng-model" => 'newItem.variant_id' }
%td.vertical-align-top
.field
= label_tag :add_quantity, t('.quantity')
%input#add_quantity.fullwidth{ type: 'number', min: 1, ng: { model: 'newItem.quantity' } }
%input#add_quantity.fullwidth{ "type" => 'number', "min" => 1, "ng-model" => 'newItem.quantity' }
%td
.actions
%a.icon-plus.button.fullwidth{ href: 'javascript:void(0)', ng: { click: 'addSubscriptionLineItem()' } }
%a.icon-plus.button.fullwidth{ "href" => 'javascript:void(0)', "ng-click" => 'addSubscriptionLineItem()' }
= t('.add')

4
app/views/admin/subscriptions/_controls.html.haml
View File

@@ -1,5 +1,5 @@
%hr.divider.sixteen.columns.alpha.omega{ ng: { show: 'shop_id && subscriptions.length > 0' } }
.controls.sixteen.columns.alpha.omega{ ng: { show: 'shop_id && subscriptions.length > 0' } }
%hr.divider.sixteen.columns.alpha.omega{ "ng-show" => 'shop_id && subscriptions.length > 0' }
.controls.sixteen.columns.alpha.omega{ "ng-show" => 'shop_id && subscriptions.length > 0' }
.twelve.columns.alpha
&nbsp;
.four.columns.omega

42
app/views/admin/subscriptions/_details.html.haml
View File

@@ -3,42 +3,42 @@
.row
.seven.columns.alpha.field
%label{ for: 'customer_id'}= t('admin.customer')
%input.ofn-select2.fullwidth#customer_id{ name: 'customer_id', type: 'number', data: 'customers', text: 'email', required: true, placeholder: t('admin.choose'), ng: { model: 'subscription.customer_id', disabled: 'subscription.id' } }
.error{ ng: { show: 'subscription_form.$submitted && subscription_details_form.customer_id.$error.required' } }= t(:error_required)
.error{ ng: { repeat: 'error in errors.customer', show: 'subscription_details_form.customer_id.$pristine' } } {{ error }}
%input.ofn-select2.fullwidth#customer_id{ "name" => 'customer_id', "type" => 'number', "data" => 'customers', "text" => 'email', "required" => true, "placeholder" => t('admin.choose'), "ng-model" => 'subscription.customer_id', "ng-disabled" => 'subscription.id' }
.error{ "ng-show" => 'subscription_form.$submitted && subscription_details_form.customer_id.$error.required' }= t(:error_required)
.error{ "ng-repeat" => 'error in errors.customer', "ng-show" => 'subscription_details_form.customer_id.$pristine' } {{ error }}
.two.columns &nbsp;
.seven.columns.omega.field
%label{ for: 'schedule_id'}= t('admin.schedule')
%input.ofn-select2.fullwidth#schedule_id{ name: 'schedule_id', type: 'number', data: 'schedules', required: true, placeholder: t('admin.choose'), ng: { model: 'subscription.schedule_id', disabled: 'subscription.id' } }
.error{ ng: { show: 'subscription_form.$submitted && subscription_details_form.schedule_id.$error.required' } }= t(:error_required)
.error{ ng: { repeat: 'error in errors.schedule', show: 'subscription_details_form.schedule_id.$pristine'} } {{ error }}
%input.ofn-select2.fullwidth#schedule_id{ "name" => 'schedule_id', "type" => 'number', "data" => 'schedules', "required" => true, "placeholder" => t('admin.choose'), "ng-model" => 'subscription.schedule_id', "ng-disabled" => 'subscription.id' }
.error{ "ng-show" => 'subscription_form.$submitted && subscription_details_form.schedule_id.$error.required' }= t(:error_required)
.error{ "ng-repeat" => 'error in errors.schedule', "ng-show" => 'subscription_details_form.schedule_id.$pristine' } {{ error }}
.row
.seven.columns.alpha.field
%label{ for: 'payment_method_id'}
= t('admin.payment_method')
%span.with-tip.icon-question-sign{ data: { powertip: "#{t('.allowed_payment_method_types_tip')}" } }
%input.ofn-select2.fullwidth#payment_method_id{ name: 'payment_method_id', type: 'number', data: 'paymentMethods', required: true, placeholder: t('admin.choose'), ng: { model: 'subscription.payment_method_id' } }
.error{ ng: { show: 'subscription_form.$submitted && subscription_details_form.payment_method_id.$error.required' } }= t(:error_required)
.error{ ng: { repeat: 'error in errors.payment_method', show: 'subscription_details_form.payment_method_id.$pristine' } } {{ error }}
.error{ ng: { show: 'cardRequired && customer.$promise && customer.$resolved && !customer.allow_charges' } }= t('.charges_not_allowed')
.error{ ng: { show: 'cardRequired && customer.$promise && customer.$resolved && customer.allow_charges && !customer.default_card_present' } }= t('.no_default_card')
.error{ ng: { repeat: 'error in errors.credit_card', show: 'subscription_details_form.payment_method_id.$pristine' } } {{ error }}
%span.with-tip.icon-question-sign{ "data-powertip" => "#{t('.allowed_payment_method_types_tip')}" }
%input.ofn-select2.fullwidth#payment_method_id{ "name" => 'payment_method_id', "type" => 'number', "data" => 'paymentMethods', "required" => true, "placeholder" => t('admin.choose'), "ng-model" => 'subscription.payment_method_id' }
.error{ "ng-show" => 'subscription_form.$submitted && subscription_details_form.payment_method_id.$error.required' }= t(:error_required)
.error{ "ng-repeat" => 'error in errors.payment_method', "ng-show" => 'subscription_details_form.payment_method_id.$pristine' } {{ error }}
.error{ "ng-show" => 'cardRequired && customer.$promise && customer.$resolved && !customer.allow_charges' }= t('.charges_not_allowed')
.error{ "ng-show" => 'cardRequired && customer.$promise && customer.$resolved && customer.allow_charges && !customer.default_card_present' }= t('.no_default_card')
.error{ "ng-repeat" => 'error in errors.credit_card', "ng-show" => 'subscription_details_form.payment_method_id.$pristine' } {{ error }}
.two.columns &nbsp;
.seven.columns.omega.field
%label{ for: 'shipping_method_id'}= t('admin.shipping_method')
%input.ofn-select2.fullwidth#shipping_method_id{ name: 'shipping_method_id', type: 'number', data: 'shippingMethods', required: true, placeholder: t('admin.choose'), ng: { model: 'subscription.shipping_method_id' } }
.error{ ng: { show: 'subscription_form.$submitted && subscription_details_form.shipping_method_id.$error.required' } }= t(:error_required)
.error{ ng: { repeat: 'error in errors.shipping_method', show: 'subscription_details_form.shipping_method_id.$pristine' } } {{ error }}
%input.ofn-select2.fullwidth#shipping_method_id{ "name" => 'shipping_method_id', "type" => 'number', "data" => 'shippingMethods', "required" => true, "placeholder" => t('admin.choose'), "ng-model" => 'subscription.shipping_method_id' }
.error{ "ng-show" => 'subscription_form.$submitted && subscription_details_form.shipping_method_id.$error.required' }= t(:error_required)
.error{ "ng-repeat" => 'error in errors.shipping_method', "ng-show" => 'subscription_details_form.shipping_method_id.$pristine' } {{ error }}
.row
.seven.columns.alpha.field
%label{ for: 'begins_at'}= t('admin.begins_at')
%input.fullwidth#begins_at{ name: 'begins_at', type: 'text', placeholder: "#{t('.begins_at_placeholder')}", data: { controller: "flatpickr" }, required: true, ng: { model: 'subscription.begins_at' } }
.error{ ng: { show: 'subscription_form.$submitted && subscription_details_form.begins_at.$error.required' } }= t(:error_required)
.error{ ng: { repeat: 'error in errors.begins_at', show: 'subscription_details_form.begins_at.$pristine' } } {{ error }}
%input.fullwidth#begins_at{ "name" => 'begins_at', "type" => 'text', "placeholder" => "#{t('.begins_at_placeholder')}", "required" => true, "data-controller" => "flatpickr", "ng-model" => 'subscription.begins_at' }
.error{ "ng-show" => 'subscription_form.$submitted && subscription_details_form.begins_at.$error.required' }= t(:error_required)
.error{ "ng-repeat" => 'error in errors.begins_at', "ng-show" => 'subscription_details_form.begins_at.$pristine' } {{ error }}
.two.columns &nbsp;
.seven.columns.omega.field
%label{ for: 'ends_at'}= t('admin.ends_at')
%input.fullwidth#ends_at{ name: 'ends_at', type: 'text', placeholder: "#{t('.ends_at_placeholder')}", data: { controller: "flatpickr" }, ng: { model: 'subscription.ends_at' } }
.error{ ng: { repeat: 'error in errors.ends_at', show: 'subscription_details_form.ends_at.$pristine' } } {{ error }}
%input.fullwidth#ends_at{ "name" => 'ends_at', "type" => 'text', "placeholder" => "#{t('.ends_at_placeholder')}", "data-controller" => "flatpickr", "ng-model" => 'subscription.ends_at' }
.error{ "ng-repeat" => 'error in errors.ends_at', "ng-show" => 'subscription_details_form.ends_at.$pristine' } {{ error }}

6
app/views/admin/subscriptions/_filters.html.haml
View File

@@ -1,11 +1,11 @@
.row.filters
.sixteen.columns.alpha.omega
.filter_select.five.columns.alpha
%label{ :for => 'query', ng: {class: '{disabled: !shop_id}'} }=t('admin.quick_search')
%label{ "for" => 'query', "ng-class" => '{disabled: !shop_id}' }=t('admin.quick_search')
%br
%input.fullwidth{ :type => "text", :id => 'query', ng: { model: 'query', disabled: '!shop_id'}, :placeholder => "#{t('.query_placeholder')}" }
%input.fullwidth{ "type" => "text", "id" => 'query', "placeholder" => "#{t('.query_placeholder')}", "ng-model" => 'query', "ng-disabled" => '!shop_id' }
.filter_select.four.columns
%label{ :for => 'shop_id', ng: { bind: "shop_id ? '#{t('admin.shop')}' : '#{t('admin.variant_overrides.index.select_a_shop')}'" } }
%label{ "for" => 'shop_id', "ng-bind" => "shop_id ? '#{t('admin.shop')}' : '#{t('admin.variant_overrides.index.select_a_shop')}'" }
%br
%input.ofn-select2.fullwidth#shop_id{ 'ng-model' => 'shop_id', name: 'shop_id', data: 'shops' }
.seven.columns.omega &nbsp;

32
app/views/admin/subscriptions/_form.html.haml
View File

@@ -1,27 +1,27 @@
%form.margin-bottom-50{ name: 'subscription_form', novalidate: true, ng: { submit: 'save()' } }
%form.margin-bottom-50{ "name" => 'subscription_form', "novalidate" => true, "ng-submit" => 'save()' }
%save-bar{ persist: 'true' }
%div{ ng: { hide: 'subscription.id' } }
%a.button{ href: main_app.admin_subscriptions_path, ng: { show: "['details','review'].indexOf(view) >= 0" } }= t(:cancel)
%input{ type: "button", value: t(:back), ng: { click: 'back()', show: '!!backCallbacks[view]'} }
%input.red{ type: "button", value: t(:next), ng: { click: 'next()', show: '!!nextCallbacks[view]' } }
%input.red{ type: "submit", value: t('.create'), ng: { show: "view == 'review'" } }
%div{ ng: { show: 'subscription.id' } }
%div{ "ng-hide" => 'subscription.id' }
%a.button{ "href" => main_app.admin_subscriptions_path, "ng-show" => "['details','review'].indexOf(view) >= 0" }= t(:cancel)
%input{ "type" => "button", "value" => t(:back), "ng-click" => 'back()', "ng-show" => '!!backCallbacks[view]' }
%input.red{ "type" => "button", "value" => t(:next), "ng-click" => 'next()', "ng-show" => '!!nextCallbacks[view]' }
%input.red{ "type" => "submit", "value" => t('.create'), "ng-show" => "view == 'review'" }
%div{ "ng-show" => 'subscription.id' }
%a.button{ href: main_app.admin_subscriptions_path }= t(:close)
%input.red{ type: "button", value: t(:review), ng: { click: "setView('review')", show: "view != 'review'" } }
%input.red{ type: "submit", value: t(:save_changes), ng: { disabled: 'subscription_form.$pristine' } }
%input.red{ "type" => "button", "value" => t(:review), "ng-click" => "setView('review')", "ng-show" => "view != 'review'" }
%input.red{ "type" => "submit", "value" => t(:save_changes), "ng-disabled" => 'subscription_form.$pristine' }
.details{ ng: { show: "view == 'details'" } }
%ng-form{ name: 'subscription_details_form', ng: { controller: 'DetailsController' } }
.details{ "ng-show" => "view == 'details'" }
%ng-form{ "name" => 'subscription_details_form', "ng-controller" => 'DetailsController' }
= render 'details'
.address{ ng: { show: "view == 'address'" } }
%ng-form{ name: 'subscription_address_form', ng: { controller: 'AddressController' } }
.address{ "ng-show" => "view == 'address'" }
%ng-form{ "name" => 'subscription_address_form', "ng-controller" => 'AddressController' }
= render 'address'
.products{ ng: { show: "view == 'products'" } }
%ng-form{ name: 'subscription_products_form', ng: { controller: 'ProductsController' } }
.products{ "ng-show" => "view == 'products'" }
%ng-form{ "name" => 'subscription_products_form', "ng-controller" => 'ProductsController' }
= render :partial => "spree/admin/variants/autocomplete", :formats => :js
= render 'products'
.review{ ng: { show: "view == 'review'", controller: 'ReviewController' } }
.review{ "ng-show" => "view == 'review'", "ng-controller" => 'ReviewController' }
= render 'review'

2
app/views/admin/subscriptions/_loading_flash.html.haml
View File

@@ -1,4 +1,4 @@
%div.sixteen.columns.alpha.omega#loading{ ng: { cloak: true, if: 'shop_id && RequestMonitor.loading' } }
%div.sixteen.columns.alpha.omega#loading{ "ng-cloak" => true, "ng-if" => 'shop_id && RequestMonitor.loading' }
= render partial: "components/admin_spinner"
%h1
= t('.loading')

6
app/views/admin/subscriptions/_no_results.html.haml
View File

@@ -1,7 +1,7 @@
%div.margin-top-30.text-center{ ng: { show: 'shop_id && !RequestMonitor.loading && filteredSubscriptions.length == 0' } }
.no-results{ ng: { show: '!filtersApplied()' } }
%div.margin-top-30.text-center{ "ng-show" => 'shop_id && !RequestMonitor.loading && filteredSubscriptions.length == 0' }
.no-results{ "ng-show" => '!filtersApplied()' }
%h1.margin-bottom-20=t('.no_subscriptions')
%span.text-big=t('.why_dont_you_add_one')
.no-results{ ng: { show: 'filtersApplied()' } }
.no-results{ "ng-show" => 'filtersApplied()' }
%h1=t('.no_matching_subscriptions')

14
app/views/admin/subscriptions/_order_update_issues_dialog.html.haml
View File

@@ -2,7 +2,7 @@
#order_update_issues_dialog
.message.clearfix.margin-bottom-30
.text=t("admin.subscriptions.order_update_issues_msg")
%div{ ng: { controller: 'OrderUpdateIssuesController' } }
%div{ "ng-controller" => 'OrderUpdateIssuesController' }
%table
%col{ style: 'width: 30%' }
%col{ style: 'width: 30%' }
@@ -12,14 +12,14 @@
%th= t('admin.order_cycle')
%th= t('admin.subscriptions.issue')
%tbody
%tr.proxy_order{ :id => "ppo_{{proxyOrder.id}}", ng: { repeat: 'proxyOrder in options.proxyOrders' } }
%tr.proxy_order{ "id" => "ppo_{{proxyOrder.id}}", "ng-repeat" => 'proxyOrder in options.proxyOrders' }
%td
%a{ href: '{{::proxyOrder.edit_path}}', target: '_blank', ng: { bind: '::proxyOrder.number' } }
%a{ "href" => '{{::proxyOrder.edit_path}}', "target" => '_blank', "ng-bind" => '::proxyOrder.number' }
%td
%div{ ng: { bind: "::orderCycleName(proxyOrder.order_cycle_id)" } }
%div{ ng: { bind: "::orderCycleCloses(proxyOrder.order_cycle_id)" } }
%td.text-center{ ng: { bind: "proxyOrder.update_issues.join(', ')" } }
%div{ "ng-bind" => "::orderCycleName(proxyOrder.order_cycle_id)" }
%div{ "ng-bind" => "::orderCycleCloses(proxyOrder.order_cycle_id)" }
%td.text-center{ "ng-bind" => "proxyOrder.update_issues.join(', ')" }
.action-buttons.text-center
%button{ ng: { click: "close()" } }
%button{ "ng-click" => "close()" }
OK

16
app/views/admin/subscriptions/_orders_panel.html.haml
View File

@@ -1,5 +1,5 @@
%script{ type: "text/ng-template", id: "admin/panels/proxy_orders.html" }
%form.margin-top-30{ name: 'subscription_form', ng: { controller: 'OrdersPanelController' } }
%form.margin-top-30{ "name" => 'subscription_form', "ng-controller" => 'OrdersPanelController' }
.row.subscription-orders
.fourteen.columns.offset-by-one
%table
@@ -13,14 +13,14 @@
%th= t('total')
%th.actions
%tbody
%tr.proxy_order{ :id => "po_{{proxyOrder.id}}", ng: { repeat: 'proxyOrder in subscription.not_closed_proxy_orders' } }
%tr.proxy_order{ "id" => "po_{{proxyOrder.id}}", "ng-repeat" => 'proxyOrder in subscription.not_closed_proxy_orders' }
%td
%div{ ng: { bind: "::orderCycleName(proxyOrder.order_cycle_id)" } }
%div{ ng: { bind: "::orderCycleCloses(proxyOrder.order_cycle_id)" } }
%div{ "ng-bind" => "::orderCycleName(proxyOrder.order_cycle_id)" }
%div{ "ng-bind" => "::orderCycleCloses(proxyOrder.order_cycle_id)" }
%td.text-center
%span.state{ ng: { class: "proxyOrder.state", bind: 'stateText(proxyOrder.state)' } }
%td.text-center{ ng: { bind: '(proxyOrder.total || subscription.estimatedTotal()) | localizeCurrency' } }
%span.state{ "ng-class" => "proxyOrder.state", "ng-bind" => 'stateText(proxyOrder.state)' }
%td.text-center{ "ng-bind" => '(proxyOrder.total || subscription.estimatedTotal()) | localizeCurrency' }
%td.actions
%a.edit-order.icon-edit.no-text{ href: '{{::proxyOrder.edit_path}}', target: '_blank', 'ofn-with-tip' => t(:edit_order), confirm_order_edit: true }
%a.cancel-order.icon-remove.no-text{ href: 'javascript:void(0)', ng: { hide: "proxyOrder.state == 'canceled'", click: "cancelOrder(proxyOrder)" }, 'ofn-with-tip' => t(:cancel_order) }
%a.resume-order.icon-resume.no-text{ href: 'javascript:void(0)', ng: { show: "proxyOrder.state == 'canceled'", click: "resumeOrder(proxyOrder)" }, 'ofn-with-tip' => t(:resume_order) }
%a.cancel-order.icon-remove.no-text{ "href" => 'javascript:void(0)', "ofn-with-tip" => t(:cancel_order), "ng-hide" => "proxyOrder.state == 'canceled'", "ng-click" => "cancelOrder(proxyOrder)" }
%a.resume-order.icon-resume.no-text{ "href" => 'javascript:void(0)', "ofn-with-tip" => t(:resume_order), "ng-show" => "proxyOrder.state == 'canceled'", "ng-click" => "resumeOrder(proxyOrder)" }

2
app/views/admin/subscriptions/_products.html.haml
View File

@@ -1,3 +1,3 @@
%div{ ng: { controller: 'SubscriptionLineItemsController' } }
%div{ "ng-controller" => 'SubscriptionLineItemsController' }
= render 'autocomplete'
= render 'subscription_line_items'

10
app/views/admin/subscriptions/_products_panel.html.haml
View File

@@ -1,15 +1,15 @@
= render :partial => "spree/admin/variants/autocomplete", :formats => :js
%script{ type: "text/ng-template", id: "admin/panels/subscription_products.html" }
%form{ name: 'subscription_form', ng: { controller: 'ProductsPanelController' } }
%form{ "name" => 'subscription_form', "ng-controller" => 'ProductsPanelController' }
%div{ style: 'width: 90%; margin: auto;' }
= render 'products'
%a.button.update.fullwidth{ ng: { class: "{disabled: saved() && !saving, saving: saving}", click: "save()" } }
%span{ ng: {hide: "saved() || saving" } }
%a.button.update.fullwidth{ "ng-class" => "{disabled: saved() && !saving, saving: saving}", "ng-click" => "save()" }
%span{ "ng-hide" => "saved() || saving" }
= t('.save')
%i.icon-save
%span{ ng: {show: "saved() && !saving" } }
%span{ "ng-show" => "saved() && !saving" }
= t('.saved')
%i.icon-ok-sign
%span{ ng: {show: "saving" } }
%span{ "ng-show" => "saving" }
= t('.saving')
%i.icon-refresh

10
app/views/admin/subscriptions/_review.html.haml
View File

@@ -6,7 +6,7 @@
.five.columns.alpha
%h3= t('.details')
.eleven.columns.omega
%input#edit-details{ type: "button", value: t(:edit), ng: { click: "setView('details')" } }
%input#edit-details{ "type" => "button", "value" => t(:edit), "ng-click" => "setView('details')" }
.row
.five.columns.alpha
%strong= t('admin.customer')
@@ -35,7 +35,7 @@
.five.columns.alpha
%h3= t('.address')
.eleven.columns.omega
%input#edit-address{ type: "button", value: t(:edit), ng: { click: "setView('address')" } }
%input#edit-address{ "type" => "button", "value" => t(:edit), "ng-click" => "setView('address')" }
.row
.five.columns.alpha
%strong= t('admin.bill_address')
@@ -53,7 +53,7 @@
.five.columns.alpha
%h3= t('.products')
.eleven.columns.omega
%input#edit-products{ type: "button", value: t(:edit), ng: { click: "setView('products')" } }
%input#edit-products{ "type" => "button", "value" => t(:edit), "ng-click" => "setView('products')" }
.row
%table#subscription-line-items.admin-subscription-review-subscription-line-items
%colgroup
@@ -69,10 +69,10 @@
%th.total
%span= t(:total)
%tbody
%tr.item{ id: "sli_{{$index}}", ng: { repeat: "item in subscription.subscription_line_items | filter:{ _destroy: '!true' }", class: { even: 'even', odd: 'odd' } } }
%tr.item{ "id" => "sli_{{$index}}", "ng-repeat" => "item in subscription.subscription_line_items | filter:{ _destroy: '!true' }", "ng-class-even" => 'even', "ng-class-odd" => 'odd' }
%td
.description {{ item.description }}
.not-in-open-and-upcoming-order-cycles-warning{ ng: { if: '!item.in_open_and_upcoming_order_cycles' } }
.not-in-open-and-upcoming-order-cycles-warning{ "ng-if" => '!item.in_open_and_upcoming_order_cycles' }
= t(".no_open_or_upcoming_order_cycle")
%td.price.align-center {{ item.price_estimate | localizeCurrency }}
%td.quantity {{ item.quantity }}

10
app/views/admin/subscriptions/_subscription_line_items.html.haml
View File

@@ -14,17 +14,17 @@
%span= t(:total)
%th.orders-actions.actions
%tbody
%tr.item{ id: "sli_{{$index}}", ng: { repeat: "item in subscription.subscription_line_items | filter:{ _destroy: '!true' }", class: { even: 'even', odd: 'odd' } } }
%tr.item{ "id" => "sli_{{$index}}", "ng-repeat" => "item in subscription.subscription_line_items | filter:{ _destroy: '!true' }", "ng-class-even" => 'even', "ng-class-odd" => 'odd' }
%td
.description {{ item.description }}
.not-in-open-and-upcoming-order-cycles-warning{ ng: { if: '!item.in_open_and_upcoming_order_cycles' } }
.not-in-open-and-upcoming-order-cycles-warning{ "ng-if" => '!item.in_open_and_upcoming_order_cycles' }
= t(".not_in_open_and_upcoming_order_cycles_warning")
%td.price.align-center {{ item.price_estimate | localizeCurrency }}
%td.quantity
%input{ name: 'quantity', type: 'number', min: 0, ng: { model: 'item.quantity' } }
%input{ "name" => 'quantity', "type" => 'number', "min" => 0, "ng-model" => 'item.quantity' }
%td.total.align-center {{ (item.price_estimate * item.quantity) | localizeCurrency }}
%td.actions
%a.delete-item.icon-trash.no-text{ ng: { click: 'removeSubscriptionLineItem(item)'}, :href => "javascript:void(0)" }
%a.delete-item.icon-trash.no-text{ "href" => "javascript:void(0)", "ng-click" => 'removeSubscriptionLineItem(item)' }
%tbody#subtotal.no-border-top
%tr#subtotal-row
%td{:colspan => "3"}
@@ -34,7 +34,7 @@
%td.total.align-center
%span#order_subtotal {{ subscription.estimatedSubtotal() | localizeCurrency }}
%td.actions
%tbody#fees.no-border-top{ ng: { show: "subscription.estimatedFees() > 0" } }
%tbody#fees.no-border-top{ "ng-show" => "subscription.estimatedFees() > 0" }
%tr#fees-row
%td{:colspan => "3"}
%b

Some files were not shown because too many files have changed in this diff Show More