Updating Tag Rules UI to allow management of new FilterShippingMethods rule type

app/assets/javascripts/admin/tag_rules/controllers/tag_rules_controller.js.coffee

@@ -1,6 +1,8 @@
 angular.module("admin.tagRules").controller "TagRulesCtrl", ($scope, $http, enterprise) ->
   $scope.tagGroups = enterprise.tag_groups
 
+  $scope.visibilityOptions = [ { id: "visible", name: "VISIBLE" }, { id: "hidden", name: "NOT VISIBLE" } ]
+
   updateRuleCounts = ->
     index = 0
     for tagGroup in $scope.tagGroups
@@ -13,13 +15,18 @@ angular.module("admin.tagRules").controller "TagRulesCtrl", ($scope, $http, ente
     for tagRule in tagGroup.rules
       tagRule.preferred_customer_tags = (tag.text for tag in tagGroup.tags).join(",")
 
-  $scope.addNewRuleTo = (tagGroup) ->
-    tagGroup.rules.push
-      id: null
-      preferred_customer_tags: (tag.text for tag in tagGroup.tags).join(",")
-      type: "TagRule::DiscountOrder"
-      calculator:
-        preferred_flat_percent: 0
+  $scope.addNewRuleTo = (tagGroup, ruleType) ->
+    newRule =
+        id: null
+        preferred_customer_tags: (tag.text for tag in tagGroup.tags).join(",")
+        type: "TagRule::#{ruleType}"
+    switch ruleType
+      when "DiscountOrder"
+        newRule.calculator = { preferred_flat_percent: 0 }
+      when "FilterShippingMethods"
+        newRule.peferred_shipping_method_tags = []
+        newRule.preferred_matched_shipping_methods_visibility = "visible"
+    tagGroup.rules.push(newRule)
     updateRuleCounts()
 
   $scope.addNewTag = ->

app/assets/javascripts/admin/tag_rules/directives/new_rule_dialog.js.coffee

@@ -0,0 +1,31 @@
+angular.module("admin.tagRules").directive 'newTagRuleDialog', ($compile, $templateCache) ->
+  restrict: 'A'
+  scope: true
+  link: (scope, element, attr) ->
+    # Compile modal template
+    template = $compile($templateCache.get('admin/new_tag_rule_dialog.html'))(scope)
+
+    scope.ruleTypes = [
+      { id: "DiscountOrder", name: 'Apply a discount to orders' }
+      { id: "FilterShippingMethods", name: 'Show/Hide shipping methods' }
+    ]
+
+    scope.ruleType = "DiscountOrder"
+
+    # Set Dialog options
+    template.dialog
+      autoOpen: false
+      resizable: false
+      width: 'auto'
+      scaleW: 0.4
+      modal: true
+      clickOut: true
+
+    # Link opening of dialog to click event on element
+    element.bind 'click', (e) ->
+      template.dialog('open')
+
+    scope.addRule = (tagGroup, ruleType) ->
+      scope.addNewRuleTo(tagGroup, ruleType)
+      template.dialog('close')
+      return

app/assets/javascripts/admin/tag_rules/directives/tag_rules/filter_shipping_methods.js.coffee

@@ -0,0 +1,4 @@
+angular.module("admin.tagRules").directive "filterShippingMethods", ->
+  restrict: "E"
+  replace: true
+  templateUrl: "admin/tag_rules/filter_shipping_methods.html"

app/assets/javascripts/templates/admin/new_tag_rule_dialog.html.haml

@@ -0,0 +1,10 @@
+#new-tag-rule-dialog
+  .text-normal.margin-bottom-30.text-center
+    Select a rule type:
+
+  .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" }
+
+  .text-center
+    %input.button.red.icon-plus{ type: 'button', value: "Add Rule", ng: { click: 'addRule(tagGroup, ruleType)' } }

app/assets/javascripts/templates/admin/tag_rules/discount_order.html.haml

@@ -28,12 +28,10 @@
     name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][calculator_attributes][preferred_flat_percent]",
     ng: { value: "rule.calculator.preferred_flat_percent" } }
 
-  %span.text-normal {{ $index + 1 }}. Apply a discount of
-  %span.input-symbol.after
-    %span.text-normal %
-    %input.text-big{ 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 }
-  %span.text-normal to order subtotals
+  %span.text-normal {{ $index + 1 }}. Orders are discounted by
+  %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 }
+  %span.text-normal %

app/assets/javascripts/templates/admin/tag_rules/filter_shipping_methods.html.haml

@@ -0,0 +1,27 @@
+%div
+  %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]",
+    value: "TagRule::FilterShippingMethods" }
+
+  %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_shipping_method_tags",
+    name: "enterprise[tag_rules_attributes][{{tagGroup.startIndex + $index}}][preferred_shipping_method_tags]",
+    ng: { value: "rule.preferred_customer_tags" } }
+
+  %span.text-normal {{ $index + 1 }}. Shipping methods with matching tags are
+  %input.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"},
+    data: 'visibilityOptions', "min-search" => 5 }
+  -# %tags-with-translation{ object: "rule", "tags-attr" => "shipping_method_tags", "tag-list-attr" => "preferred_shipping_method_tags" }