workarea-admin 3.4.45 → 3.5.0.beta.1

data/app/views/workarea/admin/pricing_discount_code_lists/promo_codes.html.haml

@@ -17,7 +17,7 @@
 
   .view__container.view__container--narrow
     = render_cards_for(@code_list, :promo_codes)
-    %p.align-center= t('workarea.admin.pricing_discount_code_lists.promo_code', count: @code_list.promo_codes.count)
+    %p.align-center= t('workarea.admin.pricing_discount_code_lists.promo_code', count: @code_list.count)
 
     %table
       %thead

data/app/views/workarea/admin/pricing_discount_redemptions/index.html.haml

@@ -0,0 +1,44 @@
+- @page_title = t('workarea.admin.pricing_discount_redemptions.index.title')
+
+.view
+  .view__header
+    .grid
+      .grid__cell.grid__cell--25
+        = render 'workarea/admin/releases/select'
+      .grid__cell.grid__cell--50
+        .view__heading
+          = link_to_index_for(@discount)
+          %h1= @discount.name
+      .grid__cell.grid__cell--25
+        = render_aux_navigation_for(@discount)
+
+  .view__container
+    = render_cards_for(@discount, :redemptions)
+
+  .view__container.view__container--narrow
+    .section
+      %h2.align-center= t('workarea.admin.pricing_discount_redemptions.index.most_recent_redemptions')
+
+      .browsing-controls.browsing-controls--center
+        %p.browsing-controls__count
+          = t('workarea.admin.pricing_discount_redemptions.index.redemption_pluralize', count: @redemptions.length)
+        %p
+          = link_to orders_path(q: @discount.id) do
+            = t('workarea.admin.pricing_discount_redemptions.index.view_orders')
+
+      - if @redemptions.any?
+        .grid.grid--center
+          .grid__cell.grid__cell--50
+            %table.index-table
+              %thead
+                %tr
+                  %th= t('workarea.admin.fields.email')
+                  %th= t('workarea.admin.pricing_discount_redemptions.index.redeemed')
+              %tbody
+                - @redemptions.each do |redemption|
+                  %tr.index-table__row
+                    %td= link_to redemption.email, orders_path(q: redemption.email)
+                    %td= local_time_ago redemption.created_at
+
+        - if @redemptions.total_pages > 1
+          = render 'workarea/admin/shared/pagination', collection: @redemptions

data/app/views/workarea/admin/pricing_discounts/_cards.html.haml

@@ -15,6 +15,7 @@
             %li
               %strong #{t('workarea.admin.fields.active')}:
               = check_box_tag 'discount', 'active', model.active, disabled: true
+              = inline_svg('workarea/admin/icons/user.svg', class: 'svg-icon svg-icon--small svg-icon--blue') if model.active? && model.segments.any?
             %li
               %strong #{t('workarea.admin.fields.redemptions')}:
               = model.redemptions.size
@@ -115,6 +116,27 @@
           = link_to insights_pricing_discount_path(model), class: 'card__button' do
             %span.button.button--small= t('workarea.admin.pricing_discounts.cards.insights.button')
 
+  .grid__cell
+    .card{ class: card_classes(:redemptions, local_assigns[:active]) }
+      = link_to pricing_discount_redemptions_path(model), class: 'card__header' do
+        %span.card__header-text= t('workarea.admin.pricing_discounts.cards.redemptions.header')
+        = inline_svg 'workarea/admin/icons/permissions.svg', class: 'card__icon'
+
+      - if local_assigns[:active].blank?
+        .card__body
+          %span.heading.heading--1.heading--no-margin.align-center
+            #{number_with_delimiter model.redemptions.size}
+          %p.align-center
+            = t('workarea.admin.pricing_discounts.cards.redemptions.order_pluralize', count: model.redemptions.size)
+
+          .align-center
+            %ul.list-reset
+              - model.redemptions.recent.limit(5).each do |redemption|
+                %li= link_to redemption.email
+
+          = link_to pricing_discount_redemptions_path(model), class: 'card__button' do
+            %span.button.button--small= t('workarea.admin.pricing_discounts.cards.redemptions.view')
+
   .grid__cell
     = render 'workarea/admin/timeline/card', timeline: model.timeline, active: local_assigns[:active]
 

data/app/views/workarea/admin/pricing_discounts/conditions/_segments.html.haml

@@ -0,0 +1,5 @@
+%fieldset.discount__rules-fields
+  %legend.discount__rules-legend
+    %span.discount__rules-heading Segments
+  %p.discount__optional-node-group{ data: { discount_options_menu_condition_group: { type: 'segments' }.to_json } }
+    %span.discount__node= select_tag 'discount[active_segment_ids]', options_from_collection_for_select(segments, :id, :name, discount.active_segment_ids), multiple: true, data: { select: { placeholder: t('workarea.admin.shared.active_field.select_segments'), allowClear: true } }

data/app/views/workarea/admin/pricing_discounts/edit.html.haml

@@ -30,22 +30,12 @@
           = text_field_tag  'discount[tag_list]', @discount.tag_list, class: 'text-box'
           %span.property__note= t('workarea.admin.form.csv_field_note')
 
-        .grid
-          .grid__cell.grid__cell--50.grid__cell--25-at-medium
-            .property
-              %span.property__name
-                = t('workarea.admin.fields.active')
-                = inline_svg('workarea/admin/i18n.svg', class: 'svg-icon svg-icon--small') if locale_options.many? && Workarea.config.localized_active_fields
-              = toggle_button_for 'discount[active]', @discount.active?
-          .grid__cell.grid__cell--50.grid__cell--25-at-medium
-            .property
-              %span.property__name
-                = t('workarea.admin.fields.auto_deactivate')
-                = link_to '#auto-deactivate-info', data: { tooltip: '' } do
-                  = inline_svg('workarea/admin/icons/help.svg', class: 'svg-icon svg-icon--small svg-icon--blue')
-              = toggle_button_for 'discount[auto_deactivate]', @discount.auto_deactivate?
+        .property
+          %span.property__name
+            = t('workarea.admin.fields.active')
+            = inline_svg('workarea/admin/i18n.svg', class: 'svg-icon svg-icon--small') if locale_options.many? && Workarea.config.localized_active_fields
+          = render 'workarea/admin/shared/active_field', scope: 'discount', model: @discount
 
-            #auto-deactivate-info.tooltip-content= t('workarea.admin.pricing_discounts.edit.auto_deactivate_info', duration: duration_in_words(Workarea.config.discount_staleness_ttl))
 
         .grid
           .grid__cell.grid__cell--33.grid__cell--25-at-medium

data/app/views/workarea/admin/pricing_discounts/index.html.haml

@@ -63,6 +63,7 @@
                 = upcoming_changesets_icon_for(result)
                 = comments_icon_for(result)
                 = top_icon_for(result)
+                = segments_icon_for(result)
               %td= result.slug.titleize
               %td.align-center= t("workarea.admin.#{result.single_use?}")
               %td.align-center= t("workarea.admin.#{result.allow_sale_items?}")

data/app/views/workarea/admin/pricing_discounts/properties/_buy_some_get_some.html.haml

@@ -32,6 +32,7 @@
     %span.discount__node= select_tag 'condition_options', options_for_select(@discount.condition_options, @discount.selected_condition_option), title: 'When to Apply Discount', data: { discount_options_menu: { type: 'condition' }.to_json }
   = render 'workarea/admin/pricing_discounts/conditions/order_total', discount: @discount
   = render 'workarea/admin/pricing_discounts/conditions/user_tags', discount: @discount
+  = render 'workarea/admin/pricing_discounts/conditions/segments', discount: @discount
   = append_partials('admin.discount_conditions', discount: @discount)
   %p.discount__node-group
     %span.discount__node applied

data/app/views/workarea/admin/pricing_discounts/properties/_category.html.haml

@@ -14,6 +14,7 @@
   = render 'workarea/admin/pricing_discounts/conditions/order_total', discount: @discount
   = render 'workarea/admin/pricing_discounts/conditions/item_quantity', discount: @discount
   = render 'workarea/admin/pricing_discounts/conditions/user_tags', discount: @discount
+  = render 'workarea/admin/pricing_discounts/conditions/segments', discount: @discount
   = append_partials('admin.discount_conditions', discount: @discount)
 
   %p.discount__node-group

data/app/views/workarea/admin/pricing_discounts/properties/_free_gift.html.haml

@@ -21,6 +21,7 @@
     %span.discount__node= select_tag 'condition_options', options_for_select(@discount.condition_options, @discount.selected_condition_option), title: 'When to Apply Discount', data: { discount_options_menu: { type: 'condition' }.to_json }
   = render 'workarea/admin/pricing_discounts/conditions/order_total', discount: @discount
   = render 'workarea/admin/pricing_discounts/conditions/user_tags', discount: @discount
+  = render 'workarea/admin/pricing_discounts/conditions/segments', discount: @discount
   = append_partials('admin.discount_conditions', discount: @discount)
   %p.discount__node-group
     %span.discount__node applied

data/app/views/workarea/admin/pricing_discounts/properties/_order_total.html.haml

@@ -14,6 +14,7 @@
     %span.discount__node= select_tag 'condition_options', options_for_select(@discount.condition_options, @discount.selected_condition_option), title: 'When to Apply Discount', data: { discount_options_menu: { type: 'condition' }.to_json }
   = render 'workarea/admin/pricing_discounts/conditions/order_total', discount: @discount
   = render 'workarea/admin/pricing_discounts/conditions/user_tags', discount: @discount
+  = render 'workarea/admin/pricing_discounts/conditions/segments', discount: @discount
   = append_partials('admin.discount_conditions', discount: @discount)
   %p.discount__node-group
     %span.discount__node applied

data/app/views/workarea/admin/pricing_discounts/properties/_product.html.haml

@@ -14,6 +14,7 @@
   = render 'workarea/admin/pricing_discounts/conditions/order_total', discount: @discount
   = render 'workarea/admin/pricing_discounts/conditions/item_quantity', discount: @discount
   = render 'workarea/admin/pricing_discounts/conditions/user_tags', discount: @discount
+  = render 'workarea/admin/pricing_discounts/conditions/segments', discount: @discount
   = append_partials('admin.discount_conditions', discount: @discount)
 
 .discount__node-line

data/app/views/workarea/admin/pricing_discounts/properties/_product_attribute.html.haml

@@ -5,7 +5,7 @@
     %span.discount__node
       %span.property.property--inline
         = text_field_tag 'discount[amount]', @discount.amount, class: 'text-box text-box--small', title: 'Amount of Discount', placeholder: '10', required: true
-    %span.discount__node off the item's unit price
+    %span.discount__node off products
 
 .discount__node-line
   %p.discount__node-group
@@ -24,6 +24,7 @@
   = render 'workarea/admin/pricing_discounts/conditions/order_total', discount: @discount
   = render 'workarea/admin/pricing_discounts/conditions/item_quantity', discount: @discount
   = render 'workarea/admin/pricing_discounts/conditions/user_tags', discount: @discount
+  = render 'workarea/admin/pricing_discounts/conditions/segments', discount: @discount
   = append_partials('admin.discount_conditions', discount: @discount)
 
   %p.discount__node-group

data/app/views/workarea/admin/pricing_discounts/properties/_quantity_fixed_price.html.haml

@@ -29,6 +29,7 @@
     %span.discount__node= select_tag 'condition_options', options_for_select(@discount.condition_options, @discount.selected_condition_option), title: 'When to Apply Discount', data: { discount_options_menu: { type: 'condition' }.to_json }
   = render 'workarea/admin/pricing_discounts/conditions/order_total', discount: @discount
   = render 'workarea/admin/pricing_discounts/conditions/user_tags', discount: @discount
+  = render 'workarea/admin/pricing_discounts/conditions/segments', discount: @discount
   = append_partials('admin.discount_conditions', discount: @discount)
   %p.discount__node-group
     %span.discount__node applied

data/app/views/workarea/admin/pricing_discounts/properties/_shipping.html.haml

@@ -13,6 +13,7 @@
     %span.discount__node= select_tag 'condition_options', options_for_select(@discount.condition_options, @discount.selected_condition_option), title: 'When to Apply Discount', data: { discount_options_menu: { type: 'condition' }.to_json }
   = render 'workarea/admin/pricing_discounts/conditions/order_total', discount: @discount
   = render 'workarea/admin/pricing_discounts/conditions/user_tags', discount: @discount
+  = render 'workarea/admin/pricing_discounts/conditions/segments', discount: @discount
   = append_partials('admin.discount_conditions', discount: @discount)
 
   %p.discount__node-group

data/app/views/workarea/admin/pricing_skus/_cards.html.haml

@@ -14,25 +14,25 @@
             %li
               %strong #{t('workarea.admin.fields.tax_code')}:
               = model.tax_code.presence || '(none)'
-            %li
-              %strong #{t('workarea.admin.fields.on_sale')}:
-              = model.on_sale?.to_s.titleize
-            %li
-              %strong #{t('workarea.admin.fields.discountable')}:
-              = model.discountable?.to_s.titleize
             %li
               %strong #{t('workarea.admin.fields.msrp')}:
               - if model.msrp.blank?
                 = t('workarea.admin.cards.attributes.no_value')
               - else
                 = number_to_currency model.msrp
-            = append_partials('admin.pricing_sku_attributes_card', pricing_sku: model)
+            %li
+              %strong #{t('workarea.admin.fields.on_sale')}:
+              = model.on_sale?.to_s.titleize
+            %li
+              %strong #{t('workarea.admin.fields.discountable')}:
+              = model.discountable?.to_s.titleize
             %li
               %strong= t('workarea.admin.fields.updated_at')
               #{local_time_ago(model.updated_at)}
             %li
               %strong= t('workarea.admin.fields.created_at')
               #{local_time_ago(model.created_at)}
+            = append_partials('admin.pricing_sku_attributes_card', pricing_sku: model)
 
           = link_to edit_pricing_sku_path(model), class: 'card__button' do
             %span.button.button--small= t('workarea.admin.cards.attributes.button')

data/app/views/workarea/admin/pricing_skus/edit.html.haml

@@ -31,6 +31,11 @@
           = label_tag 'sku[tax_code]', t('workarea.admin.fields.tax_code'), class: 'property__name'
           = text_field_tag 'sku[tax_code]', @sku.tax_code, class: 'text-box'
 
+        .property
+          = label_tag 'sku_msrp', t('workarea.admin.fields.msrp'), class: 'property__name'
+          = currency_symbol
+          = text_field_tag 'sku[msrp]', @sku.msrp, class: 'text-box text-box--small'
+
         .grid
           .grid__cell.grid__cell--50.grid__cell--25-at-medium
             .property
@@ -42,11 +47,6 @@
               %span.property__name= t('workarea.admin.fields.discountable')
               = toggle_button_for 'sku[discountable]', @sku.discountable?, title_true: t('workarea.admin.pricing_skus.allow_discounting'), title_false: t('workarea.admin.pricing_skus.disallow_discounting')
 
-        .property
-          = label_tag 'sku_msrp', t('workarea.admin.fields.msrp'), class: 'property__name'
-          = currency_symbol
-          = text_field_tag 'sku[msrp]', @sku.msrp, class: 'text-box text-box--small'
-
         = append_partials('admin.pricing_sku_fields', sku: @sku)
 
         .grid.grid--huge

data/app/views/workarea/admin/pricing_skus/index.html.haml

@@ -46,9 +46,9 @@
                 = check_box_tag 'select_all', nil, false, id: 'select_all', class: 'checkbox__input', data: { bulk_action_select_all: '' }
                 = label_tag 'select_all', t('workarea.admin.bulk_actions.select_all'), class: 'checkbox__label'
             %th= t('workarea.admin.fields.sku')
-            = append_partials('admin.pricing_skus_additional_field_labels')
             %th.align-right= t('workarea.admin.fields.msrp')
-            %th.align-right= t('workarea.admin.fields.sell_price')
+            %th.align-right= t('workarea.admin.fields.regular')
+            %th.align-right= t('workarea.admin.fields.sale_price')
             %th.align-center= t('workarea.admin.fields.on_sale')
             %th.align-center= t('workarea.admin.fields.allow_discounting')
             %th= t('workarea.admin.fields.updated_at')
@@ -62,9 +62,9 @@
               %td
                 = link_to result.id, pricing_sku_path(result)
                 = upcoming_changesets_icon_for(result)
-              = append_partials('admin.pricing_skus_additional_fields', result: result)
               %td.align-right= number_to_currency result.msrp
-              %td.align-right= result.sell_price || '–'
+              %td.align-right= number_to_currency result.regular_price
+              %td.align-right= number_to_currency result.sale_price
               %td.align-center= t("workarea.admin.#{result.on_sale?}")
               %td.align-center= t("workarea.admin.#{result.discountable?}")
               %td= local_time_ago(result.updated_at)

data/app/views/workarea/admin/pricing_skus/new.html.haml

@@ -26,16 +26,13 @@
           = label_tag 'sku[tax_code]', t('workarea.admin.fields.tax_code'), class: 'property__name'
           = text_field_tag 'sku[tax_code]', @sku.tax_code, class: 'text-box', placeholder: t('workarea.admin.pricing_skus.tax_code_placeholder')
 
-        .grid
-          .grid__cell.grid__cell--50.grid__cell--25-at-medium
-            .property
-              %span.property__name= t('workarea.admin.fields.on_sale')
-              = toggle_button_for 'sku[on_sale]', @sku.on_sale?, title_true: t('workarea.admin.pricing_skus.on_sale'), title_false: t('workarea.admin.pricing_skus.not_on_sale')
+        .property
+          %span.property__name= t('workarea.admin.fields.on_sale')
+          = toggle_button_for 'sku[on_sale]', @sku.on_sale?, title_true: t('workarea.admin.pricing_skus.on_sale'), title_false: t('workarea.admin.pricing_skus.not_on_sale')
 
-          .grid__cell.grid__cell--50.grid__cell--25-at-medium
-            .property
-              %span.property__name= t('workarea.admin.fields.discountable')
-              = toggle_button_for 'sku[discountable]', @sku.discountable?, title_true: t('workarea.admin.pricing_skus.allow_discounting'), title_false: t('workarea.admin.pricing_skus.disallow_discounting')
+        .property
+          %span.property__name= t('workarea.admin.fields.discountable')
+          = toggle_button_for 'sku[discountable]', @sku.discountable?, title_true: t('workarea.admin.pricing_skus.allow_discounting'), title_false: t('workarea.admin.pricing_skus.disallow_discounting')
 
         .property
           = label_tag 'sku_msrp', t('workarea.admin.fields.msrp'), class: 'property__name'

data/app/views/workarea/admin/product_rules/_card.html.haml

@@ -5,7 +5,7 @@
 
   - if local_assigns[:active].blank?
     .card__body
-      - if product_list.product_rules.empty?
+      - if product_list.product_rules.usable.empty?
         %p.card__empty-note= t('workarea.admin.product_rules.card.description')
         %ul
           %li= t('workarea.admin.product_rules.card.example_1')
@@ -17,7 +17,7 @@
 
       - else
         %ul.list-reset
-          - product_list.product_rules.each do |rule|
+          - product_list.product_rules.usable.each do |rule|
             %li= render_product_rule_summary_for(rule)
         = link_to product_list_product_rules_path(product_list.to_global_id), class: 'card__button' do
           %span.button.button--small= t('workarea.admin.product_rules.card.button')

data/app/views/workarea/admin/product_rules/_form.html.haml

@@ -8,5 +8,6 @@
   = form_tag product_list_product_rules_path(product_list.to_global_id), method: 'post', data: { product_rules_preview: '', product_list_id: product_list.to_global_id.to_param, rule_id: rule.id.to_s, unsaved_changes: '' } do
     = hidden_field_tag 'return_to', local_assigns[:return_to]
     = hidden_field_tag 'show_all', params[:show_all], id: nil
+    = hidden_field_tag 'product_rule[activate_with]', current_release&.id
     = render_product_rule_fields_for(rule)
     = button_tag t('workarea.admin.actions.save'), class: 'button button--small'

data/app/views/workarea/admin/product_rules/index.html.haml

@@ -3,6 +3,8 @@
 .comments.view
   .view__header
     .grid.grid--middle.grid--right
+      .grid__cell.grid__cell--25
+        = render 'workarea/admin/releases/select'
       .grid__cell.grid__cell--50
         .view__heading
           = link_to_index_for(@product_list)

data/app/views/workarea/admin/releases/_cards.html.haml

@@ -14,24 +14,12 @@
                 #{local_time_ago(model.publish_at)}
               - else
                 = t('workarea.admin.releases.cards.attributes.unscheduled')
-            %li
-              %strong= t('workarea.admin.releases.cards.attributes.undo_at')
-              - if model.undo_at.present?
-                #{local_time_ago(model.undo_at)}
-              - else
-                = t('workarea.admin.releases.cards.attributes.unscheduled')
             %li
               %strong= t('workarea.admin.releases.cards.attributes.last_published')
               - if model.published_at.present?
                 #{local_time_ago(model.published_at)}
               - else
                 = t('workarea.admin.releases.cards.attributes.never')
-            %li
-              %strong= t('workarea.admin.releases.cards.attributes.last_undone')
-              - if model.undone_at.present?
-                #{local_time_ago(model.undone_at)}
-              - else
-                = t('workarea.admin.releases.cards.attributes.never')
             %li
               %strong= t('workarea.admin.fields.tags')
               = model.tags.join(', ').presence || t('workarea.admin.releases.cards.attributes.none')
@@ -99,5 +87,55 @@
             = link_to release_changesets_path(model), class: 'card__button' do
               %span.button.button--small= t('workarea.admin.releases.cards.planned_changes.button')
 
+  .grid__cell
+    - if model.undoes?
+      .card{ class: card_classes(:original, local_assigns[:active]) }
+        = link_to original_release_path(model), class: 'card__header' do
+          %span.card__header-text= t('workarea.admin.releases.cards.original.title')
+          = inline_svg 'workarea/admin/icons/planned_changes.svg', class: 'card__icon'
+
+        - if local_assigns[:active].blank?
+          .card__body
+            .card__empty-note
+              %p= t('workarea.admin.releases.cards.original.undoes_html', link: link_to(model.undoes.name, release_path(model.undoes)))
+
+              - if model.undoes.publish_at.present? && model.undoes.publish_at.future?
+                %p= t('workarea.admin.releases.cards.undo.set_to_publish_html', link: link_to(model.undoes.name, release_path(model.undoes)), at: local_time_ago(model.undoes.publish_at))
+              - elsif model.undoes.published_at.present?
+                %p= t('workarea.admin.releases.cards.undo.published_html', link: link_to(model.undoes.name, release_path(model.undoes)), at: local_time_ago(model.undoes.published_at))
+              - else
+                %p= t('workarea.admin.releases.cards.undo.unscheduled_html', link: link_to(model.undoes.name, release_path(model.undoes)))
+
+            = link_to original_release_path(model), class: 'card__button' do
+              %span.button.button--small= t('workarea.admin.releases.cards.original.learn_more')
+
+    - else
+      .card{ class: card_classes(:undo, local_assigns[:active]) }
+        = link_to undo_release_path(model), class: 'card__header' do
+          %span.card__header-text= t('workarea.admin.releases.cards.undo.title')
+          = inline_svg 'workarea/admin/icons/planned_changes.svg', class: 'card__icon'
+
+        - if local_assigns[:active].blank?
+          .card__body
+            .card__empty-note
+              - if model.undo.blank?
+                %p= t('workarea.admin.releases.cards.undo.not_setup')
+
+                = link_to undo_release_path(model), class: 'card__button' do
+                  %span.button.button--small= t('workarea.admin.releases.cards.undo.build_an_undo')
+
+              - else
+                %p= t('workarea.admin.releases.cards.undo.undo_html', link: link_to(model.undo.name, release_path(model.undo)), at: local_time_ago(model.undo.created_at))
+
+                - if model.undo.publish_at.present? && model.undo.publish_at.future?
+                  %p= t('workarea.admin.releases.cards.undo.set_to_publish_html', link: link_to(model.undo.name, release_path(model.undo)), at: local_time_ago(model.undo.publish_at))
+                - elsif model.undo.published_at.present?
+                  %p= t('workarea.admin.releases.cards.undo.published_html', link: link_to(model.undo.name, release_path(model.undo)), at: local_time_ago(model.undo.published_at))
+                - else
+                  %p= t('workarea.admin.releases.cards.undo.unscheduled_html', link: link_to(model.undo.name, release_path(model.undo)))
+
+                = link_to undo_release_path(model), class: 'card__button' do
+                  %span.button.button--small= t('workarea.admin.releases.cards.undo.learn_more')
+
   .grid__cell
     = render 'workarea/admin/comments/card', commentable: model, active: local_assigns[:active]

data/app/views/workarea/admin/releases/_publish.html.haml

@@ -28,4 +28,4 @@
       - if current_user.can_publish_now?
         .property
           = label_tag 'release[publish_at]', t('workarea.admin.releases.publish.when_does_it_publish'), class: 'property__name'
-          = hidden_field_tag 'release[publish_at]', nil, placeholder: t('workarea.admin.releases.publish.when_does_it_publish'), data: { datetimepicker_field: { inline: true, uiOptions: { minDate: 0 } }.to_json }
+          = hidden_field_tag 'release[publish_at]', nil, placeholder: t('workarea.admin.releases.publish.when_does_it_publish'), data: { datetimepicker_field: { inline: true } }

data/app/views/workarea/admin/releases/edit.html.haml

@@ -25,57 +25,44 @@
           = label_tag 'release[name]', t('workarea.admin.releases.edit.name'), class: 'property__name'
           = text_field_tag 'release[name]', @release.name, class: 'text-box', required: true
 
-        .grid.grid--huge
-          .grid__cell.grid__cell--50-at-medium
-            .property
-              = label_tag 'release_publish_at', t('workarea.admin.fields.publish_at'), class: 'property__name'
-
-              - if current_user.can_publish_now?
-                .box.box--rounded= hidden_field_tag 'release[publish_at]', @release.publish_at, data: { datetimepicker_field: { inline: true, uiOptions: { minDate: 0 } }.to_json }
-              - elsif @release.publish_at.present?
-                = local_time(@release.publish_at)
-              - else
-                = t('workarea.admin.releases.edit.none')
-
-            .property.align-center
-              = label_tag 'release_published_at', t('workarea.admin.releases.edit.last_published_at'), class: 'property__name'
-              - if @release.published_at.present?
-                = local_time(@release.published_at)
-              - else
-                = t('workarea.admin.releases.edit.none')
-
-          .grid__cell.grid__cell--50-at-medium
-            .property
-              = label_tag 'release_undo_at', t('workarea.admin.fields.undo_at'), class: 'property__name'
-
-              - if current_user.can_publish_now?
-                .box.box--rounded= hidden_field_tag 'release[undo_at]', @release.undo_at, data: { datetimepicker_field: { inline: true, uiOptions: { minDate: 0 } }.to_json }
-              - elsif @release.undo_at.present?
-                = local_time(@release.undo_at)
-              - else
-                = t('workarea.admin.releases.edit.none')
-
-            .property.align-center
-              = label_tag 'release_undone_at', t('workarea.admin.releases.edit.last_undone_at'), class: 'property__name'
-              - if @release.undone_at.present?
-                = local_time(@release.undone_at)
-              - else
-                = t('workarea.admin.releases.edit.none')
-
         .property
           = label_tag 'release_tag_list', t('workarea.admin.fields.tags'), class: 'property__name'
           = text_field_tag 'release[tag_list]', @release.tag_list, class: 'text-box'
           %span.property__note= t('workarea.admin.releases.edit.tags_note')
 
-        .grid
-          .grid__cell.grid__cell--50.grid__cell--25-at-medium
-            .property
-              = label_tag 'release_updated_at', t('workarea.admin.fields.updated_at'), class: 'property__name'
-              = local_time(@release.updated_at)
-          .grid__cell.grid__cell--50.grid__cell--25-at-medium
-            .property
-              = label_tag 'release_created_at', t('workarea.admin.fields.created_at'), class: 'property__name'
-              = local_time(@release.created_at)
+        .align-center
+          .grid.grid--huge
+            .grid__cell.grid__cell--50-at-medium
+              .property
+                = label_tag 'release_publish_at', t('workarea.admin.fields.publish_at'), class: 'property__name'
+
+                - if current_user.can_publish_now?
+                  .box.box--rounded= hidden_field_tag 'release[publish_at]', @release.publish_at, data: { datetimepicker_field: { inline: true } }
+                - elsif @release.publish_at.present?
+                  = local_time(@release.publish_at)
+                - else
+                  = t('workarea.admin.releases.edit.none')
+
+
+
+        .align-center
+          .grid
+            .grid__cell.grid__cell--50.grid__cell--25-at-medium
+              .property
+                = label_tag 'release_published_at', t('workarea.admin.releases.edit.last_published_at'), class: 'property__name'
+                - if @release.published_at.present?
+                  = local_time(@release.published_at)
+                - else
+                  = t('workarea.admin.releases.edit.none')
+
+            .grid__cell.grid__cell--50.grid__cell--25-at-medium
+              .property
+                = label_tag 'release_updated_at', t('workarea.admin.fields.updated_at'), class: 'property__name'
+                = local_time(@release.updated_at)
+            .grid__cell.grid__cell--50.grid__cell--25-at-medium
+              .property
+                = label_tag 'release_created_at', t('workarea.admin.fields.created_at'), class: 'property__name'
+                = local_time(@release.created_at)
 
 
       .workflow-bar