spree_backend 2.4.10 → 3.0.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/spree/backend/adjustments.js.coffee +1 -2
- data/app/assets/javascripts/spree/backend/admin.js.erb +136 -53
- data/app/assets/javascripts/spree/backend/checkouts/edit.js +1 -4
- data/app/assets/javascripts/spree/backend/index.html +15 -0
- data/app/assets/javascripts/spree/backend/line_items.js.coffee +1 -4
- data/app/assets/javascripts/spree/backend/line_items_on_order_edit.js.erb +3 -16
- data/app/assets/javascripts/spree/backend/option_type_autocomplete.js.erb +2 -4
- data/app/assets/javascripts/spree/backend/option_value_picker.js +44 -0
- data/app/assets/javascripts/spree/backend/orders/edit_form.js +2 -3
- data/app/assets/javascripts/spree/backend/payments/edit.js.coffee +8 -12
- data/app/assets/javascripts/spree/backend/product_picker.js +10 -8
- data/app/assets/javascripts/spree/backend/progress.coffee +0 -21
- data/app/assets/javascripts/spree/backend/promotions.js +50 -1
- data/app/assets/javascripts/spree/backend/select_payments.js.coffee +7 -0
- data/app/assets/javascripts/spree/backend/shipments.js.erb +10 -41
- data/app/assets/javascripts/spree/backend/spree-select2.js.erb +0 -15
- data/app/assets/javascripts/spree/backend/states.js +3 -3
- data/app/assets/javascripts/spree/backend/stock_movement.js.coffee +1 -2
- data/app/assets/javascripts/spree/backend/stock_transfer.js.coffee +3 -2
- data/app/assets/javascripts/spree/backend/taxon_autocomplete.js.erb +2 -4
- data/app/assets/javascripts/spree/backend/taxon_tree_menu.js.coffee +4 -4
- data/app/assets/javascripts/spree/backend/taxonomy.js.coffee +15 -34
- data/app/assets/javascripts/spree/backend/taxons.js.coffee +27 -8
- data/app/assets/javascripts/spree/backend/user_picker.js +2 -3
- data/app/assets/javascripts/spree/backend/variant_autocomplete.js.coffee.erb +1 -2
- data/app/assets/javascripts/spree/backend/variant_management.js.coffee +1 -2
- data/app/assets/javascripts/spree/backend.js +13 -15
- data/app/assets/stylesheets/spree/backend/components/_buttons.scss +37 -0
- data/app/assets/stylesheets/spree/backend/components/_filters.scss +25 -0
- data/app/assets/stylesheets/spree/backend/components/_icons.scss +257 -0
- data/app/assets/stylesheets/spree/backend/components/_labels.scss +49 -0
- data/app/assets/stylesheets/spree/backend/components/_main.scss +5 -0
- data/app/assets/stylesheets/spree/backend/components/_navigation.scss +10 -165
- data/app/assets/stylesheets/spree/backend/components/_page_header.scss +17 -0
- data/app/assets/stylesheets/spree/backend/components/_panels.scss +3 -0
- data/app/assets/stylesheets/spree/backend/components/_sidebar.scss +116 -20
- data/app/assets/stylesheets/spree/backend/components/_tables.scss +51 -0
- data/app/assets/stylesheets/spree/backend/components/_taxon_products_view.scss +70 -0
- data/app/assets/stylesheets/spree/backend/components/_variables.scss +12 -0
- data/app/assets/stylesheets/spree/backend/components/_wells.scss +3 -0
- data/app/assets/stylesheets/spree/backend/global/_variables.scss +37 -0
- data/app/assets/stylesheets/spree/backend/plugins/_jquery_ui.scss +109 -0
- data/app/{views/spree/admin/payments/source_forms/_check.html.erb → assets/stylesheets/spree/backend/plugins/_js_tree.scss} +0 -0
- data/app/assets/stylesheets/spree/backend/plugins/_select2.scss +84 -155
- data/app/assets/stylesheets/spree/backend/sections/_account.scss +16 -0
- data/app/assets/stylesheets/spree/backend/shared/_base.scss +15 -0
- data/app/assets/stylesheets/spree/backend/shared/_forms.scss +25 -287
- data/app/assets/stylesheets/spree/backend/shared/_typography.scss +5 -138
- data/app/assets/stylesheets/spree/backend/spree_admin.css.scss +26 -0
- data/app/assets/stylesheets/spree/backend.css +1 -7
- data/app/controllers/spree/admin/base_controller.rb +0 -2
- data/app/controllers/spree/admin/customer_returns_controller.rb +1 -1
- data/app/controllers/spree/admin/general_settings_controller.rb +5 -12
- data/app/controllers/spree/admin/images_controller.rb +33 -17
- data/app/controllers/spree/admin/log_entries_controller.rb +2 -2
- data/app/controllers/spree/admin/option_types_controller.rb +5 -3
- data/app/controllers/spree/admin/orders/customer_details_controller.rb +8 -8
- data/app/controllers/spree/admin/orders_controller.rb +4 -5
- data/app/controllers/spree/admin/payments_controller.rb +3 -3
- data/app/controllers/spree/admin/products_controller.rb +3 -6
- data/app/controllers/spree/admin/resource_controller.rb +1 -1
- data/app/controllers/spree/admin/root_controller.rb +1 -0
- data/app/controllers/spree/admin/search_controller.rb +12 -0
- data/app/controllers/spree/admin/state_changes_controller.rb +18 -0
- data/app/controllers/spree/admin/stock_locations_controller.rb +4 -13
- data/app/controllers/spree/admin/stock_transfers_controller.rb +6 -6
- data/app/controllers/spree/admin/tax_categories_controller.rb +0 -13
- data/app/controllers/spree/admin/taxonomies_controller.rb +1 -1
- data/app/controllers/spree/admin/taxons_controller.rb +53 -36
- data/app/controllers/spree/admin/users_controller.rb +44 -41
- data/app/controllers/spree/admin/variants_controller.rb +1 -1
- data/app/helpers/spree/admin/adjustments_helper.rb +0 -5
- data/app/helpers/spree/admin/base_helper.rb +41 -71
- data/app/helpers/spree/admin/navigation_helper.rb +96 -28
- data/app/helpers/spree/admin/orders_helper.rb +2 -2
- data/app/views/kaminari/_first_page.html.erb +11 -0
- data/app/views/kaminari/_gap.html.erb +8 -0
- data/app/views/kaminari/_last_page.html.erb +11 -0
- data/app/views/kaminari/_next_page.html.erb +15 -0
- data/app/views/kaminari/_page.html.erb +12 -0
- data/app/views/kaminari/_paginator.html.erb +21 -0
- data/app/views/kaminari/_prev_page.html.erb +15 -0
- data/app/views/spree/admin/adjustments/_adjustment.html.erb +10 -9
- data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +19 -15
- data/app/views/spree/admin/adjustments/_form.html.erb +11 -15
- data/app/views/spree/admin/adjustments/edit.html.erb +9 -12
- data/app/views/spree/admin/adjustments/index.html.erb +19 -7
- data/app/views/spree/admin/adjustments/new.html.erb +7 -11
- data/app/views/spree/admin/countries/_form.html.erb +15 -19
- data/app/views/spree/admin/countries/edit.html.erb +4 -12
- data/app/views/spree/admin/countries/index.html.erb +6 -18
- data/app/views/spree/admin/countries/new.html.erb +3 -5
- data/app/views/spree/admin/customer_returns/_reimbursements_table.html.erb +4 -4
- data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb +9 -10
- data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb +5 -3
- data/app/views/spree/admin/customer_returns/edit.html.erb +17 -21
- data/app/views/spree/admin/customer_returns/index.html.erb +12 -16
- data/app/views/spree/admin/customer_returns/new.html.erb +29 -20
- data/app/views/spree/admin/general_settings/edit.html.erb +101 -90
- data/app/views/spree/admin/images/_form.html.erb +12 -12
- data/app/views/spree/admin/images/edit.html.erb +23 -21
- data/app/views/spree/admin/images/index.html.erb +25 -30
- data/app/views/spree/admin/images/new.html.erb +13 -11
- data/app/views/spree/admin/inventory_units/adjust.html.erb +29 -0
- data/app/views/spree/admin/log_entries/index.html.erb +9 -7
- data/app/views/spree/admin/option_types/_form.html.erb +10 -10
- data/app/views/spree/admin/option_types/_option_value_fields.html.erb +8 -10
- data/app/views/spree/admin/option_types/edit.html.erb +28 -23
- data/app/views/spree/admin/option_types/index.html.erb +16 -22
- data/app/views/spree/admin/option_types/new.html.erb +4 -3
- data/app/views/spree/admin/orders/_add_line_item.html.erb +9 -10
- data/app/views/spree/admin/orders/_add_product.html.erb +11 -9
- data/app/views/spree/admin/orders/_adjustments.html.erb +21 -7
- data/app/views/spree/admin/orders/_form.html.erb +23 -10
- data/app/views/spree/admin/orders/_line_item.html.erb +18 -6
- data/app/views/spree/admin/orders/_line_items.html.erb +45 -45
- data/app/views/spree/admin/orders/_line_items_edit_form.html.erb +10 -11
- data/app/views/spree/admin/orders/_risk_analysis.html.erb +13 -13
- data/app/views/spree/admin/orders/_shipment.html.erb +31 -39
- data/app/views/spree/admin/orders/_shipment_manifest.html.erb +23 -17
- data/app/views/spree/admin/orders/cart.html.erb +14 -15
- data/app/views/spree/admin/orders/customer_details/_form.html.erb +73 -52
- data/app/views/spree/admin/orders/customer_details/edit.html.erb +19 -15
- data/app/views/spree/admin/orders/edit.html.erb +12 -9
- data/app/views/spree/admin/orders/index.html.erb +145 -84
- data/app/views/spree/admin/payment_methods/_form.html.erb +26 -30
- data/app/views/spree/admin/payment_methods/edit.html.erb +5 -14
- data/app/views/spree/admin/payment_methods/index.html.erb +14 -29
- data/app/views/spree/admin/payment_methods/new.html.erb +4 -12
- data/app/views/spree/admin/payments/_capture_events.html.erb +2 -2
- data/app/views/spree/admin/payments/_form.html.erb +27 -30
- data/app/views/spree/admin/payments/_list.html.erb +20 -16
- data/app/views/spree/admin/payments/credit.html.erb +2 -2
- data/app/views/spree/admin/payments/index.html.erb +15 -13
- data/app/views/spree/admin/payments/new.html.erb +10 -11
- data/app/views/spree/admin/payments/show.html.erb +12 -9
- data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +43 -47
- data/app/views/spree/admin/payments/source_views/_gateway.html.erb +19 -19
- data/app/views/spree/admin/product_properties/_product_property_fields.html.erb +5 -5
- data/app/views/spree/admin/product_properties/index.html.erb +5 -17
- data/app/views/spree/admin/products/_add_stock_form.html.erb +34 -25
- data/app/views/spree/admin/products/_autocomplete.js.erb +18 -7
- data/app/views/spree/admin/products/_form.html.erb +145 -150
- data/app/views/spree/admin/products/_properties_form.erb +2 -2
- data/app/views/spree/admin/products/edit.html.erb +3 -8
- data/app/views/spree/admin/products/index.html.erb +42 -63
- data/app/views/spree/admin/products/new.html.erb +29 -33
- data/app/views/spree/admin/products/stock.html.erb +67 -82
- data/app/views/spree/admin/promotion_actions/create.js.erb +1 -2
- data/app/views/spree/admin/promotion_actions/destroy.js.erb +1 -1
- data/app/views/spree/admin/promotion_categories/_form.html.erb +9 -9
- data/app/views/spree/admin/promotion_categories/edit.html.erb +2 -4
- data/app/views/spree/admin/promotion_categories/index.html.erb +27 -26
- data/app/views/spree/admin/promotion_categories/new.html.erb +1 -3
- data/app/views/spree/admin/promotion_rules/create.js.erb +1 -1
- data/app/views/spree/admin/promotion_rules/destroy.js.erb +1 -1
- data/app/views/spree/admin/promotions/_actions.html.erb +20 -17
- data/app/views/spree/admin/promotions/_form.html.erb +40 -39
- data/app/views/spree/admin/promotions/_promotion_action.html.erb +6 -6
- data/app/views/spree/admin/promotions/_promotion_rule.html.erb +7 -6
- data/app/views/spree/admin/promotions/_rules.html.erb +36 -35
- data/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb +25 -23
- data/app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb +23 -21
- data/app/views/spree/admin/promotions/actions/_create_line_items.html.erb +16 -16
- data/app/views/spree/admin/promotions/calculators/_default_fields.html.erb +8 -6
- data/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb +29 -24
- data/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb +29 -23
- data/app/views/spree/admin/promotions/edit.html.erb +16 -11
- data/app/views/spree/admin/promotions/index.html.erb +34 -58
- data/app/views/spree/admin/promotions/new.html.erb +4 -6
- data/app/views/spree/admin/promotions/rules/_item_total.html.erb +11 -7
- data/app/views/spree/admin/promotions/rules/_landing_page.html.erb +9 -5
- data/app/views/spree/admin/promotions/rules/_option_value.html.erb +42 -0
- data/app/views/spree/admin/promotions/rules/_product.html.erb +9 -8
- data/app/views/spree/admin/promotions/rules/_taxon.html.erb +9 -8
- data/app/views/spree/admin/promotions/rules/_user.html.erb +5 -3
- data/app/views/spree/admin/properties/_form.html.erb +9 -9
- data/app/views/spree/admin/properties/edit.html.erb +3 -9
- data/app/views/spree/admin/properties/index.html.erb +42 -52
- data/app/views/spree/admin/properties/new.html.erb +10 -9
- data/app/views/spree/admin/prototypes/_form.html.erb +25 -28
- data/app/views/spree/admin/prototypes/_prototypes.html.erb +4 -8
- data/app/views/spree/admin/prototypes/available.js.erb +1 -1
- data/app/views/spree/admin/prototypes/edit.html.erb +3 -11
- data/app/views/spree/admin/prototypes/index.html.erb +23 -36
- data/app/views/spree/admin/prototypes/new.html.erb +8 -7
- data/app/views/spree/admin/prototypes/show.html.erb +15 -18
- data/app/views/spree/admin/refund_reasons/edit.html.erb +2 -2
- data/app/views/spree/admin/refund_reasons/index.html.erb +2 -2
- data/app/views/spree/admin/refund_reasons/new.html.erb +1 -1
- data/app/views/spree/admin/refunds/edit.html.erb +14 -18
- data/app/views/spree/admin/refunds/new.html.erb +19 -27
- data/app/views/spree/admin/reimbursement_types/index.html.erb +6 -7
- data/app/views/spree/admin/reimbursements/edit.html.erb +25 -31
- data/app/views/spree/admin/reimbursements/index.html.erb +4 -10
- data/app/views/spree/admin/reimbursements/show.html.erb +32 -36
- data/app/views/spree/admin/reports/index.html.erb +4 -4
- data/app/views/spree/admin/reports/sales_total.html.erb +6 -11
- data/app/views/spree/admin/return_authorization_reasons/edit.html.erb +0 -0
- data/app/views/spree/admin/return_authorization_reasons/index.html.erb +2 -2
- data/app/views/spree/admin/return_authorization_reasons/new.html.erb +0 -0
- data/app/views/spree/admin/return_authorizations/_form.html.erb +20 -20
- data/app/views/spree/admin/return_authorizations/edit.html.erb +6 -6
- data/app/views/spree/admin/return_authorizations/index.html.erb +12 -12
- data/app/views/spree/admin/return_authorizations/new.html.erb +6 -10
- data/app/views/spree/admin/search/products.rabl +9 -0
- data/app/views/spree/admin/search/users.rabl +21 -21
- data/app/views/spree/admin/shared/_address_form.html.erb +22 -22
- data/app/views/spree/admin/shared/_alert.html.erb +8 -5
- data/app/views/spree/admin/shared/_calculator_fields.html.erb +13 -8
- data/app/views/spree/admin/shared/_content_header.html.erb +19 -16
- data/app/views/spree/admin/shared/_edit_resource_links.html.erb +3 -3
- data/app/views/spree/admin/shared/_error_messages.html.erb +12 -0
- data/app/views/spree/admin/shared/_head.html.erb +4 -8
- data/app/views/spree/admin/shared/_header.html.erb +27 -8
- data/app/views/spree/admin/shared/_index_table_options.html.erb +23 -0
- data/app/views/spree/admin/shared/_main_menu.html.erb +35 -0
- data/app/views/spree/admin/shared/_new_resource_links.html.erb +3 -3
- data/app/views/spree/admin/shared/_order_summary.html.erb +121 -48
- data/app/views/spree/admin/shared/_order_tabs.html.erb +55 -7
- data/app/views/spree/admin/shared/_product_tabs.html.erb +19 -25
- data/app/views/spree/admin/shared/_refunds.html.erb +9 -9
- data/app/views/spree/admin/shared/_report_criteria.html.erb +4 -4
- data/app/views/spree/admin/shared/_report_order_criteria.html.erb +12 -12
- data/app/views/spree/admin/shared/_sidebar.html.erb +1 -6
- data/app/views/spree/admin/shared/_table_filter.html.erb +21 -5
- data/app/views/spree/admin/shared/named_types/_edit.html.erb +6 -7
- data/app/views/spree/admin/shared/named_types/_form.html.erb +10 -14
- data/app/views/spree/admin/shared/named_types/_index.html.erb +6 -17
- data/app/views/spree/admin/shared/named_types/_new.html.erb +5 -5
- data/app/views/spree/admin/shared/sub_menu/_configuration.html.erb +21 -0
- data/app/views/spree/admin/shared/sub_menu/_product.html.erb +8 -0
- data/app/views/spree/admin/shared/sub_menu/_promotion.html.erb +4 -0
- data/app/views/spree/admin/shipping_categories/_form.html.erb +2 -2
- data/app/views/spree/admin/shipping_categories/edit.html.erb +4 -14
- data/app/views/spree/admin/shipping_categories/index.html.erb +24 -32
- data/app/views/spree/admin/shipping_categories/new.html.erb +2 -10
- data/app/views/spree/admin/shipping_methods/_form.html.erb +88 -67
- data/app/views/spree/admin/shipping_methods/edit.html.erb +6 -19
- data/app/views/spree/admin/shipping_methods/index.html.erb +13 -25
- data/app/views/spree/admin/shipping_methods/new.html.erb +2 -12
- data/app/views/spree/admin/state_changes/index.html.erb +42 -0
- data/app/views/spree/admin/states/_form.html.erb +6 -6
- data/app/views/spree/admin/states/_state_list.html.erb +6 -11
- data/app/views/spree/admin/states/edit.html.erb +3 -11
- data/app/views/spree/admin/states/index.html.erb +5 -9
- data/app/views/spree/admin/states/new.html.erb +1 -4
- data/app/views/spree/admin/states/new.js.erb +2 -2
- data/app/views/spree/admin/stock_locations/_form.html.erb +51 -45
- data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb +15 -15
- data/app/views/spree/admin/stock_locations/edit.html.erb +4 -6
- data/app/views/spree/admin/stock_locations/index.html.erb +12 -26
- data/app/views/spree/admin/stock_locations/new.html.erb +3 -5
- data/app/views/spree/admin/stock_movements/_form.html.erb +10 -12
- data/app/views/spree/admin/stock_movements/edit.html.erb +4 -4
- data/app/views/spree/admin/stock_movements/index.html.erb +9 -15
- data/app/views/spree/admin/stock_movements/new.html.erb +3 -3
- data/app/views/spree/admin/stock_transfers/_stock_movements.html.erb +17 -22
- data/app/views/spree/admin/stock_transfers/index.html.erb +36 -49
- data/app/views/spree/admin/stock_transfers/new.html.erb +73 -77
- data/app/views/spree/admin/stock_transfers/show.html.erb +21 -29
- data/app/views/spree/admin/tax_categories/_form.html.erb +19 -27
- data/app/views/spree/admin/tax_categories/edit.html.erb +4 -6
- data/app/views/spree/admin/tax_categories/index.html.erb +13 -26
- data/app/views/spree/admin/tax_categories/new.html.erb +3 -6
- data/app/views/spree/admin/tax_categories/show.html.erb +1 -1
- data/app/views/spree/admin/tax_rates/_form.html.erb +34 -25
- data/app/views/spree/admin/tax_rates/edit.html.erb +4 -15
- data/app/views/spree/admin/tax_rates/index.html.erb +18 -32
- data/app/views/spree/admin/tax_rates/new.html.erb +2 -14
- data/app/views/spree/admin/taxonomies/_form.html.erb +5 -5
- data/app/views/spree/admin/taxonomies/_js_head.html.erb +0 -0
- data/app/views/spree/admin/taxonomies/_list.html.erb +9 -12
- data/app/views/spree/admin/taxonomies/edit.erb +11 -22
- data/app/views/spree/admin/taxonomies/index.html.erb +9 -15
- data/app/views/spree/admin/taxonomies/new.html.erb +4 -16
- data/app/views/spree/admin/taxons/_form.html.erb +38 -38
- data/app/views/spree/admin/taxons/_taxon_table.html.erb +2 -2
- data/app/views/spree/admin/taxons/edit.html.erb +5 -13
- data/app/views/spree/admin/taxons/index.html.erb +6 -13
- data/app/views/spree/admin/trackers/_form.html.erb +17 -23
- data/app/views/spree/admin/trackers/edit.html.erb +4 -14
- data/app/views/spree/admin/trackers/index.html.erb +9 -15
- data/app/views/spree/admin/trackers/new.html.erb +2 -10
- data/app/views/spree/admin/users/_addresses_form.html.erb +33 -17
- data/app/views/spree/admin/users/_form.html.erb +17 -17
- data/app/views/spree/admin/users/_lifetime_stats.html.erb +26 -0
- data/app/views/spree/admin/users/_sidebar.html.erb +14 -34
- data/app/views/spree/admin/users/_user_page_actions.html.erb +2 -6
- data/app/views/spree/admin/users/addresses.html.erb +8 -7
- data/app/views/spree/admin/users/edit.html.erb +55 -38
- data/app/views/spree/admin/users/index.html.erb +44 -30
- data/app/views/spree/admin/users/items.html.erb +13 -24
- data/app/views/spree/admin/users/new.html.erb +1 -7
- data/app/views/spree/admin/users/orders.html.erb +11 -17
- data/app/views/spree/admin/variants/_autocomplete.js.erb +13 -15
- data/app/views/spree/admin/variants/_autocomplete_line_items_stock.js.erb +41 -44
- data/app/views/spree/admin/variants/_autocomplete_stock.js.erb +46 -51
- data/app/views/spree/admin/variants/_form.html.erb +34 -34
- data/app/views/spree/admin/variants/_split.js.erb +8 -4
- data/app/views/spree/admin/variants/edit.html.erb +2 -4
- data/app/views/spree/admin/variants/index.html.erb +14 -33
- data/app/views/spree/admin/variants/new.html.erb +8 -6
- data/app/views/spree/admin/variants/new.js.erb +1 -1
- data/app/views/spree/admin/zones/_country_members.html.erb +14 -8
- data/app/views/spree/admin/zones/_form.html.erb +42 -31
- data/app/views/spree/admin/zones/_state_members.html.erb +14 -8
- data/app/views/spree/admin/zones/edit.html.erb +3 -11
- data/app/views/spree/admin/zones/index.html.erb +9 -19
- data/app/views/spree/admin/zones/new.html.erb +2 -13
- data/app/views/spree/layouts/admin.html.erb +63 -36
- data/config/initializers/assets.rb +1 -1
- data/config/routes.rb +4 -1
- data/lib/spree/backend/engine.rb +3 -0
- data/lib/spree_backend.rb +2 -0
- data/vendor/assets/javascripts/jquery.cookie.js +115 -39
- data/vendor/assets/javascripts/modernizr.js +3 -3
- data/vendor/assets/javascripts/underscore-min.js +6 -0
- data/vendor/assets/javascripts/underscore-min.map +1 -0
- data/vendor/assets/javascripts/velocity.js +3831 -0
- data/vendor/assets/stylesheets/animate.css +3158 -0
- metadata +85 -96
- data/app/assets/javascripts/spree/backend/images/index.js.coffee +0 -16
- data/app/assets/javascripts/spree/backend/images/new.js.coffee +0 -7
- data/app/assets/javascripts/spree/backend/underscore-min.js +0 -1227
- data/app/assets/stylesheets/spree/backend/components/_actions.scss +0 -31
- data/app/assets/stylesheets/spree/backend/components/_date-picker.scss +0 -159
- data/app/assets/stylesheets/spree/backend/components/_messages.scss +0 -54
- data/app/assets/stylesheets/spree/backend/components/_pagination.scss +0 -17
- data/app/assets/stylesheets/spree/backend/components/_product_autocomplete.scss +0 -29
- data/app/assets/stylesheets/spree/backend/components/_progress.scss +0 -35
- data/app/assets/stylesheets/spree/backend/components/_states.scss +0 -34
- data/app/assets/stylesheets/spree/backend/components/_table-filter.scss +0 -14
- data/app/assets/stylesheets/spree/backend/globals/_functions.scss +0 -25
- data/app/assets/stylesheets/spree/backend/globals/_mixins.scss +0 -25
- data/app/assets/stylesheets/spree/backend/globals/_variables.scss +0 -171
- data/app/assets/stylesheets/spree/backend/globals/_variables_override.scss +0 -7
- data/app/assets/stylesheets/spree/backend/hacks/_ie.scss +0 -72
- data/app/assets/stylesheets/spree/backend/hacks/_mozilla.scss +0 -33
- data/app/assets/stylesheets/spree/backend/hacks/_opera.scss +0 -17
- data/app/assets/stylesheets/spree/backend/plugins/_jstree.scss +0 -135
- data/app/assets/stylesheets/spree/backend/plugins/_powertip.scss +0 -86
- data/app/assets/stylesheets/spree/backend/plugins/_token-input.scss +0 -110
- data/app/assets/stylesheets/spree/backend/sections/_adjustments_table.scss +0 -8
- data/app/assets/stylesheets/spree/backend/sections/_alerts.scss +0 -27
- data/app/assets/stylesheets/spree/backend/sections/_bulk_transfer.scss +0 -8
- data/app/assets/stylesheets/spree/backend/sections/_edit_checkouts.scss +0 -72
- data/app/assets/stylesheets/spree/backend/sections/_image_settings.scss +0 -3
- data/app/assets/stylesheets/spree/backend/sections/_log_entries.scss +0 -17
- data/app/assets/stylesheets/spree/backend/sections/_orders.scss +0 -64
- data/app/assets/stylesheets/spree/backend/sections/_overview.scss +0 -86
- data/app/assets/stylesheets/spree/backend/sections/_products.scss +0 -123
- data/app/assets/stylesheets/spree/backend/sections/_promotions.scss +0 -119
- data/app/assets/stylesheets/spree/backend/sections/_return_authorizations.scss +0 -24
- data/app/assets/stylesheets/spree/backend/sections/_tax_zones.scss +0 -15
- data/app/assets/stylesheets/spree/backend/sections/_taxons.scss +0 -21
- data/app/assets/stylesheets/spree/backend/sections/_users.scss +0 -5
- data/app/assets/stylesheets/spree/backend/shared/_icons.scss +0 -53
- data/app/assets/stylesheets/spree/backend/shared/_layout.scss +0 -99
- data/app/assets/stylesheets/spree/backend/shared/_tables.scss +0 -214
- data/app/assets/stylesheets/spree/backend/spree_admin.scss +0 -45
- data/app/views/spree/admin/line_items/create.js.erb +0 -1
- data/app/views/spree/admin/line_items/destroy.js.erb +0 -1
- data/app/views/spree/admin/option_types/new.js.erb +0 -2
- data/app/views/spree/admin/payments/_bill_address_form.html.erb +0 -9
- data/app/views/spree/admin/payments/source_views/_check.html.erb +0 -0
- data/app/views/spree/admin/products/new.js.erb +0 -7
- data/app/views/spree/admin/promotions/_tab.html.erb +0 -1
- data/app/views/spree/admin/promotions/rules/_first_order.html.erb +0 -0
- data/app/views/spree/admin/promotions/rules/_one_use_per_user.html.erb +0 -0
- data/app/views/spree/admin/promotions/rules/_user_logged_in.html.erb +0 -0
- data/app/views/spree/admin/properties/filtered.html.erb +0 -1
- data/app/views/spree/admin/properties/new.js.erb +0 -2
- data/app/views/spree/admin/prototypes/new.js.erb +0 -5
- data/app/views/spree/admin/shared/_address.html.erb +0 -6
- data/app/views/spree/admin/shared/_configuration_menu.html.erb +0 -28
- data/app/views/spree/admin/shared/_menu.html.erb +0 -9
- data/app/views/spree/admin/shared/_order_submenu.html.erb +0 -49
- data/app/views/spree/admin/shared/_product_sub_menu.html.erb +0 -10
- data/app/views/spree/admin/shared/_promotion_sub_menu.html.erb +0 -6
- data/app/views/spree/admin/shared/_show_resource_links.html.erb +0 -5
- data/app/views/spree/admin/shared/_sub_menu.html.erb +0 -9
- data/app/views/spree/admin/shared/_tabs.html.erb +0 -21
- data/app/views/spree/admin/taxonomies/_taxon.html.erb +0 -12
- data/app/views/spree/admin/taxons/search.rabl +0 -5
- data/app/views/spree/admin/variants/update.js.erb +0 -1
- data/vendor/assets/images/jquery.alerts/images/help.gif +0 -0
- data/vendor/assets/images/jquery.alerts/images/important.gif +0 -0
- data/vendor/assets/images/jquery.alerts/images/info.gif +0 -0
- data/vendor/assets/images/jquery.alerts/images/title.gif +0 -0
- data/vendor/assets/javascripts/css_browser_selector_dev.js +0 -129
- data/vendor/assets/javascripts/equalize.js +0 -41
- data/vendor/assets/javascripts/jquery.adaptivemenu.js +0 -60
- data/vendor/assets/javascripts/jquery.alerts/jquery.alerts.js +0 -235
- data/vendor/assets/javascripts/jquery.delayedobserver.js +0 -35
- data/vendor/assets/javascripts/jquery.powertip.js +0 -796
- data/vendor/assets/javascripts/jquery.vAlign.js +0 -11
- data/vendor/assets/javascripts/responsive-tables.js +0 -42
- data/vendor/assets/javascripts/spin.js +0 -379
- data/vendor/assets/javascripts/trunk8.js +0 -369
- data/vendor/assets/stylesheets/jquery.alerts/jquery.alerts.css.erb +0 -57
- data/vendor/assets/stylesheets/jquery.alerts/jquery.alerts.spree.css +0 -29
- data/vendor/assets/stylesheets/jquery.powertip.css +0 -85
- data/vendor/assets/stylesheets/responsive-tables.css +0 -21
@@ -1,30 +1,30 @@
|
|
1
1
|
collection(@users)
|
2
2
|
attributes :email, :id
|
3
3
|
address_fields = [:firstname, :lastname,
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
4
|
+
:address1, :address2,
|
5
|
+
:city, :zipcode,
|
6
|
+
:phone, :state_name,
|
7
|
+
:state_id, :country_id,
|
8
|
+
:company]
|
9
9
|
|
10
|
-
child :ship_address => :ship_address do
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
10
|
+
child :ship_address => :ship_address do
|
11
|
+
attributes *address_fields
|
12
|
+
child :state do
|
13
|
+
attributes :name
|
14
|
+
end
|
15
15
|
|
16
|
-
|
17
|
-
|
16
|
+
child :country do
|
17
|
+
attributes :name
|
18
|
+
end
|
18
19
|
end
|
19
|
-
end
|
20
20
|
|
21
|
-
child :bill_address => :bill_address do
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
21
|
+
child :bill_address => :bill_address do
|
22
|
+
attributes *address_fields
|
23
|
+
child :state do
|
24
|
+
attributes :name
|
25
|
+
end
|
26
26
|
|
27
|
-
|
28
|
-
|
27
|
+
child :country do
|
28
|
+
attributes :name
|
29
|
+
end
|
29
30
|
end
|
30
|
-
end
|
@@ -1,63 +1,63 @@
|
|
1
1
|
<% s_or_b = type.chars.first %>
|
2
2
|
|
3
3
|
<div id="<%= type %>" data-hook="address_fields">
|
4
|
-
<div class="
|
4
|
+
<div class="form-group <%= "#{type}-row" %>">
|
5
5
|
<%= f.label :firstname, Spree.t(:first_name) %>
|
6
|
-
<%= f.text_field :firstname, :
|
6
|
+
<%= f.text_field :firstname, class: 'form-control' %>
|
7
7
|
</div>
|
8
8
|
|
9
|
-
<div class="
|
9
|
+
<div class="form-group <%= "#{type}-row" %>">
|
10
10
|
<%= f.label :lastname, Spree.t(:last_name) %>
|
11
|
-
<%= f.text_field :lastname, :
|
11
|
+
<%= f.text_field :lastname, class: 'form-control' %>
|
12
12
|
</div>
|
13
13
|
|
14
14
|
<% if Spree::Config[:company] %>
|
15
|
-
<div class="
|
15
|
+
<div class="form-group <%= "#{type}-row" %>">
|
16
16
|
<%= f.label :company, Spree.t(:company) %>
|
17
|
-
<%= f.text_field :company, :
|
17
|
+
<%= f.text_field :company, class: 'form-control' %>
|
18
18
|
</div>
|
19
19
|
<% end %>
|
20
20
|
|
21
|
-
<div class="
|
21
|
+
<div class="form-group <%= "#{type}-row" %>">
|
22
22
|
<%= f.label :address1, Spree.t(:street_address) %>
|
23
|
-
<%= f.text_field :address1, :
|
23
|
+
<%= f.text_field :address1, class: 'form-control' %>
|
24
24
|
</div>
|
25
25
|
|
26
|
-
<div class="
|
26
|
+
<div class="form-group <%= "#{type}-row" %>">
|
27
27
|
<%= f.label :address2, Spree.t(:street_address_2) %>
|
28
|
-
<%= f.text_field :address2, :
|
28
|
+
<%= f.text_field :address2, class: 'form-control' %>
|
29
29
|
</div>
|
30
30
|
|
31
|
-
<div class="
|
31
|
+
<div class="form-group <%= "#{type}-row" %>">
|
32
32
|
<%= f.label :city, Spree.t(:city) %>
|
33
|
-
<%= f.text_field :city, :
|
33
|
+
<%= f.text_field :city, class: 'form-control' %>
|
34
34
|
</div>
|
35
35
|
|
36
|
-
<div class="
|
36
|
+
<div class="form-group <%= "#{type}-row" %>">
|
37
37
|
<%= f.label :zipcode, Spree.t(:zip) %>
|
38
|
-
<%= f.text_field :zipcode, :
|
38
|
+
<%= f.text_field :zipcode, class: 'form-control' %>
|
39
39
|
</div>
|
40
40
|
|
41
|
-
<div class="
|
41
|
+
<div class="form-group <%= "#{type}-row" %>">
|
42
42
|
<%= f.label :country_id, Spree.t(:country) %>
|
43
43
|
<span id="<%= s_or_b %>country">
|
44
|
-
<%= f.collection_select :country_id, available_countries, :id, :name, {}, {:
|
44
|
+
<%= f.collection_select :country_id, available_countries, :id, :name, {}, { class: 'select2' } %>
|
45
45
|
</span>
|
46
46
|
</div>
|
47
47
|
|
48
|
-
<div class="
|
48
|
+
<div class="form-group <%= "#{type}-row" %>">
|
49
49
|
<%= f.label :state_id, Spree.t(:state) %>
|
50
50
|
<span id="<%= s_or_b %>state">
|
51
51
|
<%= f.text_field :state_name,
|
52
|
-
:
|
53
|
-
|
54
|
-
<%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, {:
|
52
|
+
style: "display: #{f.object.country.states.empty? ? 'block' : 'none' };",
|
53
|
+
disabled: !f.object.country.states.empty?, class: 'form-control state_name' %>
|
54
|
+
<%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, { include_blank: true }, { class: 'select2', style: "display: #{f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty? } %>
|
55
55
|
</span>
|
56
56
|
</div>
|
57
57
|
|
58
|
-
<div class="
|
58
|
+
<div class="form-group <%= "#{type}-row" %>">
|
59
59
|
<%= f.label :phone, Spree.t(:phone) %>
|
60
|
-
<%= f.phone_field :phone, :
|
60
|
+
<%= f.phone_field :phone, class: 'form-control' %>
|
61
61
|
</div>
|
62
62
|
</div>
|
63
63
|
|
@@ -1,5 +1,8 @@
|
|
1
|
-
<div class="
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
1
|
+
<div class="col-md-12">
|
2
|
+
<div class="alert <%= alert['severity'].downcase %>">
|
3
|
+
<%= alert['message'] %> <%= link_to alert['url_name'], alert['url'] if alert['url'] %>
|
4
|
+
<%= link_to 'X', spree.dismiss_alert_admin_general_settings_path(:alert_id => alert['id']),
|
5
|
+
:remote => true, :method => :post, :class => 'dismiss' %>
|
6
|
+
</div>
|
7
|
+
|
8
|
+
</div>
|
@@ -1,16 +1,21 @@
|
|
1
|
-
<
|
2
|
-
<legend align="center"><%= Spree.t(:calculator) %></legend>
|
1
|
+
<div id="calculator_fields" data-hook class="panel panel-default">
|
3
2
|
|
4
|
-
<div
|
5
|
-
<
|
3
|
+
<div class="panel-heading">
|
4
|
+
<h1 class="panel-title">
|
5
|
+
<%= Spree.t(:calculator) %>
|
6
|
+
</h1>
|
7
|
+
</div>
|
8
|
+
|
9
|
+
<div id="preference-settings" data-hook class="panel-body">
|
10
|
+
<div class="form-group">
|
6
11
|
<%= f.label(:calculator_type, Spree.t(:calculator), :for => 'calc_type') %>
|
7
|
-
<%= f.select(:calculator_type, @calculators.map { |c| [c.description, c.name] }, {}, {:id => 'calc_type', :class => 'select2
|
12
|
+
<%= f.select(:calculator_type, @calculators.map { |c| [c.description, c.name] }, {}, {:id => 'calc_type', :class => 'select2'}) %>
|
8
13
|
</div>
|
9
14
|
<% if !@object.new_record? %>
|
10
|
-
<div class="
|
15
|
+
<div class="form-group">
|
11
16
|
<div class="calculator-settings">
|
12
17
|
<%= f.fields_for :calculator do |calculator_form| %>
|
13
|
-
<%= preference_fields
|
18
|
+
<%= preference_fields @object.calculator, calculator_form %>
|
14
19
|
<% end %>
|
15
20
|
</div>
|
16
21
|
<% if @object.calculator.respond_to?(:preferences) %>
|
@@ -19,4 +24,4 @@
|
|
19
24
|
</div>
|
20
25
|
<% end %>
|
21
26
|
</div>
|
22
|
-
</
|
27
|
+
</div>
|
@@ -1,23 +1,26 @@
|
|
1
1
|
<% if content_for?(:page_title) || content_for?(:page_actions) %>
|
2
|
-
<div
|
3
|
-
<div class="
|
4
|
-
|
5
|
-
<
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
</div>
|
2
|
+
<div class="content-header <%= "with-page-tabs" if content_for?(:page_tabs) %> page-header">
|
3
|
+
<div class="row">
|
4
|
+
<% if content_for?(:page_title) %>
|
5
|
+
<h1 class="col-sm-<%= content_for?(:page_actions) ? '6' : '12' %>">
|
6
|
+
<%= yield :page_title %>
|
7
|
+
<% if content_for?(:page_title_small) %>
|
8
|
+
<small><%= yield :page_title_small %></small>
|
10
9
|
<% end %>
|
10
|
+
</h1>
|
11
|
+
<% end %>
|
11
12
|
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
<%= yield :page_actions %>
|
16
|
-
</ul>
|
17
|
-
</div>
|
18
|
-
<% end %>
|
13
|
+
<% if content_for?(:page_actions) %>
|
14
|
+
<div class="page-actions col-sm-6" data-hook="toolbar">
|
15
|
+
<%= yield :page_actions %>
|
19
16
|
</div>
|
20
|
-
|
17
|
+
<% end %>
|
18
|
+
|
19
|
+
<% if content_for?(:page_tabs) %>
|
20
|
+
<ul class="nav nav-tabs">
|
21
|
+
<%= yield :page_tabs %>
|
22
|
+
</ul>
|
23
|
+
<% end %>
|
21
24
|
</div>
|
22
25
|
</div>
|
23
26
|
<% end %>
|
@@ -1,5 +1,5 @@
|
|
1
|
-
<div class="form-
|
2
|
-
<%= button Spree.t('actions.update'), 'refresh' %>
|
1
|
+
<div class="form-actions" data-hook="buttons">
|
2
|
+
<%= button Spree.t('actions.update'), 'refresh', 'submit', {class: 'btn-success'} %>
|
3
3
|
<span class="or"><%= Spree.t(:or) %></span>
|
4
|
-
<%= button_link_to Spree.t('actions.cancel'), collection_url, :icon => '
|
4
|
+
<%= button_link_to Spree.t('actions.cancel'), collection_url, :icon => 'delete' %>
|
5
5
|
</div>
|
@@ -0,0 +1,12 @@
|
|
1
|
+
<% if target && target.errors.any? %>
|
2
|
+
<div id="errorExplanation" class="errorExplanation alert alert-danger" data-hook>
|
3
|
+
<p>
|
4
|
+
<strong><%= Spree.t(:errors_prohibited_this_record_from_being_saved, :count => target.errors.count) %>:</strong><br/>
|
5
|
+
</p>
|
6
|
+
<ul class="ul-with-markup">
|
7
|
+
<% target.errors.full_messages.each do |msg| %>
|
8
|
+
<li><%= msg %></li>
|
9
|
+
<% end %>
|
10
|
+
</ul>
|
11
|
+
</div>
|
12
|
+
<% end %>
|
@@ -1,4 +1,6 @@
|
|
1
|
-
<meta
|
1
|
+
<meta charset="utf-8">
|
2
|
+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
3
|
+
<meta name="viewport" content="width=device-width, initial-scale=1">
|
2
4
|
|
3
5
|
<%= csrf_meta_tags %>
|
4
6
|
|
@@ -11,19 +13,13 @@
|
|
11
13
|
<% end %>
|
12
14
|
</title>
|
13
15
|
|
14
|
-
<!-- Get "Open Sans" font from Google -->
|
15
|
-
<link href='//fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600&subset=latin,cyrillic,greek,vietnamese' rel='stylesheet' type='text/css'>
|
16
|
-
|
17
16
|
<%= stylesheet_link_tag 'spree/backend/all' %>
|
18
17
|
|
19
18
|
<%= javascript_include_tag 'spree/backend/all' %>
|
20
|
-
|
21
19
|
<%= render "spree/admin/shared/translations" %>
|
22
20
|
|
23
21
|
<%= javascript_tag do -%>
|
24
|
-
jQuery.alerts.dialogClass = 'spree';
|
25
22
|
<%== "var AUTH_TOKEN = #{form_authenticity_token.inspect};" %>
|
26
|
-
|
27
|
-
<% end %>
|
23
|
+
<% end -%>
|
28
24
|
|
29
25
|
<%= yield :head %>
|
@@ -1,9 +1,28 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
1
|
+
<% admin = try_spree_current_user.try(:has_spree_role?, "admin") %>
|
2
|
+
|
3
|
+
<header class="header <%= admin ? "logged-in" : "logged-out" %>">
|
4
|
+
|
5
|
+
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
|
6
|
+
<div class="container-fluid">
|
7
|
+
<div class="row">
|
8
|
+
<div class="navbar-header col-sm-3 col-md-2">
|
9
|
+
<%= link_to image_tag(Spree::Config[:admin_interface_logo], id: 'logo', height: '100%'), spree.admin_path, class: "logo navbar-brand" %>
|
10
|
+
<% if admin %>
|
11
|
+
<span class="navbar-toggle" id="sidebar-toggle">
|
12
|
+
<span class="icon-bar"></span>
|
13
|
+
<span class="icon-bar"></span>
|
14
|
+
<span class="icon-bar"></span>
|
15
|
+
</span>
|
16
|
+
<% end %>
|
17
|
+
</div>
|
18
|
+
|
19
|
+
<% if admin %>
|
20
|
+
<div class="col-sm-9 col-md-10">
|
21
|
+
<div class="navbar-right" data-hook="admin_login_navigation_bar"></div>
|
22
|
+
</div>
|
23
|
+
<% end %>
|
24
|
+
</div>
|
25
|
+
</div>
|
26
|
+
</nav>
|
27
|
+
|
9
28
|
</header>
|
@@ -0,0 +1,23 @@
|
|
1
|
+
<div class="row index-pagination-row">
|
2
|
+
<div class="col-sm-6">
|
3
|
+
<%= paginate collection %>
|
4
|
+
</div>
|
5
|
+
<div class="col-sm-6">
|
6
|
+
<div class="pagination-wrap">
|
7
|
+
<%= form_tag({ :action => "index"}, { :method => "get", :id => "js-per-page-form", :class => 'form-inline' }) do %>
|
8
|
+
<%= per_page_dropdown %>
|
9
|
+
<% end %>
|
10
|
+
<div class="clearfix"></div>
|
11
|
+
</div>
|
12
|
+
</div>
|
13
|
+
</div>
|
14
|
+
|
15
|
+
<% content_for :head do %>
|
16
|
+
<%= javascript_tag do -%>
|
17
|
+
$(document).ready(function() {
|
18
|
+
$("#js-per-page-select").change(function() {
|
19
|
+
$("#js-per-page-form").submit();
|
20
|
+
});
|
21
|
+
});
|
22
|
+
<% end -%>
|
23
|
+
<% end %>
|
@@ -0,0 +1,35 @@
|
|
1
|
+
<% if can? :admin, Spree::Order %>
|
2
|
+
<ul class="nav nav-sidebar">
|
3
|
+
<%= tab *Spree::BackendConfiguration::ORDER_TABS, icon: 'shopping-cart' %>
|
4
|
+
</ul>
|
5
|
+
<% end %>
|
6
|
+
|
7
|
+
<% if can? :admin, Spree::Product %>
|
8
|
+
<ul class="nav nav-sidebar">
|
9
|
+
<%= main_menu_tree Spree.t(:products), icon: "th-large", sub_menu: "product", url: "#sidebar-product" %>
|
10
|
+
</ul>
|
11
|
+
<% end %>
|
12
|
+
|
13
|
+
<% if can? :admin, Spree::Admin::ReportsController %>
|
14
|
+
<ul class="nav nav-sidebar">
|
15
|
+
<%= tab *Spree::BackendConfiguration::REPORT_TABS, icon: 'file' %>
|
16
|
+
</ul>
|
17
|
+
<% end %>
|
18
|
+
|
19
|
+
<% if can? :admin, Spree::Promotion %>
|
20
|
+
<ul class="nav nav-sidebar">
|
21
|
+
<%= main_menu_tree Spree.t(:promotions), icon: "gift", sub_menu: "promotion", url: "#sidebar-promotions" %>
|
22
|
+
</ul>
|
23
|
+
<% end %>
|
24
|
+
|
25
|
+
<% if Spree.user_class && can?(:admin, Spree.user_class) %>
|
26
|
+
<ul class="nav nav-sidebar">
|
27
|
+
<%= tab *Spree::BackendConfiguration::USER_TABS, url: spree.admin_users_path, icon: 'user' %>
|
28
|
+
</ul>
|
29
|
+
<% end %>
|
30
|
+
|
31
|
+
<% if can? :admin, current_store %>
|
32
|
+
<ul class="nav nav-sidebar">
|
33
|
+
<%= main_menu_tree Spree.t(:configurations), icon: "wrench", sub_menu: "configuration", url: "#sidebar-configuration" %>
|
34
|
+
</ul>
|
35
|
+
<% end %>
|
@@ -1,5 +1,5 @@
|
|
1
|
-
<div class="form-
|
2
|
-
<%= button Spree.t('actions.create'), 'ok' %>
|
1
|
+
<div class="form-actions" data-hook="buttons">
|
2
|
+
<%= button Spree.t('actions.create'), 'ok', 'submit', {class: 'btn-success'} %>
|
3
3
|
<span class="or"><%= Spree.t(:or) %></span>
|
4
|
-
<%=
|
4
|
+
<%= button_link_to Spree.t('actions.cancel'), collection_url, :icon => 'remove' %>
|
5
5
|
</div>
|
@@ -1,48 +1,121 @@
|
|
1
|
-
<
|
2
|
-
<
|
3
|
-
<
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
<
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
<
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
1
|
+
<div class="panel panel-default">
|
2
|
+
<div class="panel-heading">
|
3
|
+
<h3 class="panel-title"><%= Spree.t(:summary) %></h3>
|
4
|
+
</div>
|
5
|
+
|
6
|
+
<table class="table table-condensed table-bordered" id="order_tab_summary" data-hook>
|
7
|
+
<tbody class="additional-info">
|
8
|
+
<tr>
|
9
|
+
<td id="order_status" width="35%" data-hook>
|
10
|
+
<strong><%= Spree.t(:status) %>:</strong>
|
11
|
+
</td>
|
12
|
+
<td>
|
13
|
+
<span class="state label label-<%= @order.state %>">
|
14
|
+
<%= Spree.t(@order.state, :scope => :order_state) %>
|
15
|
+
</span>
|
16
|
+
</td>
|
17
|
+
</tr>
|
18
|
+
<tr>
|
19
|
+
<td data-hook='admin_order_tab_subtotal_title'>
|
20
|
+
<strong><%= Spree.t(:subtotal) %>:</strong>
|
21
|
+
</td>
|
22
|
+
<td id='item_total'>
|
23
|
+
<%= @order.display_item_total.to_html %>
|
24
|
+
</td>
|
25
|
+
</tr>
|
26
|
+
|
27
|
+
<% if @order.checkout_steps.include?("delivery") && @order.ship_total > 0 %>
|
28
|
+
<tr>
|
29
|
+
<td data-hook='admin_order_tab_ship_total_title'>
|
30
|
+
<strong><%= Spree.t(:ship_total) %>:</strong>
|
31
|
+
</td>
|
32
|
+
<td id='ship_total'>
|
33
|
+
<%= @order.display_ship_total.to_html %>
|
34
|
+
</td>
|
35
|
+
</tr>
|
36
|
+
<% end %>
|
37
|
+
|
38
|
+
<% if @order.included_tax_total != 0 %>
|
39
|
+
<tr>
|
40
|
+
<td data-hook='admin_order_tab_included_tax_title'>
|
41
|
+
<strong><%= Spree.t(:tax_included) %>:</strong>
|
42
|
+
</td>
|
43
|
+
<td id='included_tax_total'>
|
44
|
+
<%= @order.display_included_tax_total.to_html %>
|
45
|
+
</td>
|
46
|
+
</tr>
|
47
|
+
<% end %>
|
48
|
+
|
49
|
+
<% if @order.additional_tax_total != 0 %>
|
50
|
+
<tr>
|
51
|
+
<td data-hook='admin_order_tab_additional_tax_title'>
|
52
|
+
<strong><%= Spree.t(:tax) %>:</strong>
|
53
|
+
</td>
|
54
|
+
<td id='additional_tax_total'>
|
55
|
+
<%= @order.display_additional_tax_total.to_html %>
|
56
|
+
</td>
|
57
|
+
</tr>
|
58
|
+
<% end %>
|
59
|
+
|
60
|
+
<tr>
|
61
|
+
<td data-hook='admin_order_tab_total_title'>
|
62
|
+
<strong><%= Spree.t(:total) %>:</strong>
|
63
|
+
</td>
|
64
|
+
<td id='order_total'><%= @order.display_total.to_html %></td>
|
65
|
+
</tr>
|
66
|
+
|
67
|
+
<% if @order.completed? %>
|
68
|
+
<tr>
|
69
|
+
<td>
|
70
|
+
<strong><%= Spree.t(:shipment) %>:</strong>
|
71
|
+
</td>
|
72
|
+
<td id='shipment_status'>
|
73
|
+
<span class="state label label-<%= @order.shipment_state %>">
|
74
|
+
<%= Spree.t(@order.shipment_state, :scope => :shipment_states, :default => [:missing, "none"]) %>
|
75
|
+
</span>
|
76
|
+
</td>
|
77
|
+
</tr>
|
78
|
+
<tr>
|
79
|
+
<td>
|
80
|
+
<strong><%= Spree.t(:payment) %>:</strong>
|
81
|
+
</td>
|
82
|
+
<td id='payment_status'>
|
83
|
+
<span class="state label label-<%= @order.payment_state %>">
|
84
|
+
<%= Spree.t(@order.payment_state, :scope => :payment_states, :default => [:missing, "none"]) %>
|
85
|
+
</span>
|
86
|
+
</td>
|
87
|
+
</tr>
|
88
|
+
<tr>
|
89
|
+
<td data-hook='admin_order_tab_date_completed_title'>
|
90
|
+
<strong><%= Spree.t(:date_completed) %>:</strong>
|
91
|
+
</td>
|
92
|
+
<td id='date_complete'>
|
93
|
+
<%= pretty_time(@order.completed_at) %>
|
94
|
+
</td>
|
95
|
+
</tr>
|
96
|
+
<% end %>
|
97
|
+
|
98
|
+
<% if @order.approved? %>
|
99
|
+
<tr>
|
100
|
+
<td><strong><%= Spree.t(:approver) %></strong></td>
|
101
|
+
<td><%= @order.approver.email %></td>
|
102
|
+
</tr>
|
103
|
+
<tr>
|
104
|
+
<td><strong><%= Spree.t(:approved_at) %></strong></td>
|
105
|
+
<td><%= pretty_time(@order.approved_at) %></td>
|
106
|
+
</tr>
|
107
|
+
<% end %>
|
108
|
+
|
109
|
+
<% if @order.canceled? && @order.canceler && @order.canceled_at %>
|
110
|
+
<tr>
|
111
|
+
<td><strong><%= Spree.t(:canceler) %></strong></td>
|
112
|
+
<td><%= @order.canceler.email %></td>
|
113
|
+
</tr>
|
114
|
+
<tr>
|
115
|
+
<td><strong><%= Spree.t(:canceled_at) %></strong></td>
|
116
|
+
<td><%= pretty_time(@order.canceled_at) %></td>
|
117
|
+
</tr>
|
118
|
+
<% end %>
|
119
|
+
</tbody>
|
120
|
+
</table>
|
121
|
+
</div>
|
@@ -1,12 +1,60 @@
|
|
1
1
|
<% content_for :page_title do %>
|
2
|
-
<%= link_to
|
3
|
-
|
4
|
-
|
5
|
-
<% content_for :sidebar_title do %>
|
6
|
-
<%= Spree.t(:order_information) %>
|
2
|
+
<%= link_to Spree.t(:orders), admin_orders_path %> /
|
3
|
+
<%= link_to @order.number, spree.edit_admin_order_path(@order) %>
|
7
4
|
<% end %>
|
8
5
|
|
9
6
|
<% content_for :sidebar do %>
|
10
|
-
|
11
|
-
|
7
|
+
<ul class="nav nav-pills nav-stacked" data-hook="admin_order_tabs">
|
8
|
+
<% if ((can? :update, @order) && (@order.shipments.count == 0 || @order.shipments.shipped.count == 0)) %>
|
9
|
+
<li<%== ' class="active"' if current == 'Cart' %> data-hook='admin_order_tabs_cart_details'>
|
10
|
+
<%= link_to_with_icon 'edit', Spree.t(:cart), cart_admin_order_url(@order) %>
|
11
|
+
</li>
|
12
|
+
<% end %>
|
13
|
+
|
14
|
+
<% if can?(:update, @order) && @order.checkout_steps.include?("address") %>
|
15
|
+
<li<%== ' class="active"' if current == 'Customer Details' %> data-hook='admin_order_tabs_customer_details'>
|
16
|
+
<%= link_to_with_icon 'user', Spree.t(:customer), admin_order_customer_url(@order) %>
|
17
|
+
</li>
|
18
|
+
<% end %>
|
19
|
+
|
20
|
+
<% if can? :update, @order %>
|
21
|
+
<li<%== ' class="active"' if current == 'Shipments' %> data-hook='admin_order_tabs_shipment_details'>
|
22
|
+
<%= link_to_with_icon 'road', Spree.t(:shipments), edit_admin_order_url(@order) %>
|
23
|
+
</li>
|
24
|
+
<% end %>
|
25
|
+
|
26
|
+
<% if can? :index, Spree::Adjustment %>
|
27
|
+
<li<%== ' class="active"' if current == 'Adjustments' %> data-hook='admin_order_tabs_adjustments'>
|
28
|
+
<%= link_to_with_icon 'wrench', Spree.t(:adjustments), admin_order_adjustments_url(@order) %>
|
29
|
+
</li>
|
30
|
+
<% end %>
|
31
|
+
|
32
|
+
<% if can?(:index, Spree::Payment) %>
|
33
|
+
<li<%== ' class="active"' if current == 'Payments' %> data-hook='admin_order_tabs_payments'>
|
34
|
+
<%= link_to_with_icon 'credit-card', Spree.t(:payments), admin_order_payments_url(@order) %>
|
35
|
+
</li>
|
36
|
+
<% end %>
|
37
|
+
|
38
|
+
<% if can? :index, Spree::ReturnAuthorization %>
|
39
|
+
<% if @order.completed? %>
|
40
|
+
<li<%== ' class="active"' if current == 'Returns' %> data-hook='admin_order_tabs_return_authorizations'>
|
41
|
+
<%= link_to_with_icon 'transfer', Spree.t(:returns), admin_order_return_authorizations_url(@order) %>
|
42
|
+
</li>
|
43
|
+
<% end %>
|
44
|
+
<% end %>
|
45
|
+
|
46
|
+
<% if can? :index, Spree::CustomerReturn %>
|
47
|
+
<% if @order.completed? %>
|
48
|
+
<li<%== ' class="active"' if current == 'Customer Returns' %>>
|
49
|
+
<%= link_to_with_icon 'transfer', Spree.t(:customer_returns), admin_order_customer_returns_url(@order) %>
|
50
|
+
</li>
|
51
|
+
<% end %>
|
52
|
+
<% end %>
|
53
|
+
|
54
|
+
<% if can? :update, @order %>
|
55
|
+
<li<%== ' class="active"' if current == 'State Changes' %> data-hook='admin_order_tabs_state_changes'>
|
56
|
+
<%= link_to_with_icon 'refresh', Spree::StateChange.human_attribute_name(:state_changes), admin_order_state_changes_url(@order) %>
|
57
|
+
</li>
|
58
|
+
<% end %>
|
59
|
+
</ul>
|
12
60
|
<% end %>
|