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,36 +1,16 @@
|
|
1
|
-
<% content_for :sidebar_title do %>
|
2
|
-
<%= Spree.t(:"admin.user.user_information") %>
|
3
|
-
<% end %>
|
4
|
-
|
5
1
|
<% content_for :sidebar do %>
|
6
|
-
<
|
7
|
-
<
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
</ul>
|
21
|
-
|
22
|
-
<fieldset data-hook="admin_user_lifetime_stats">
|
23
|
-
<legend><%= Spree.t(:lifetime_stats) %></legend>
|
24
|
-
<dl id="user-lifetime-stats">
|
25
|
-
<dt><%= Spree.t(:total_sales) %>:</dt>
|
26
|
-
<dd><%= @user.display_lifetime_value.to_html %></dd>
|
27
|
-
<dt><%= Spree.t(:num_orders) %>:</dt>
|
28
|
-
<dd><%= @user.order_count.to_i %></dd>
|
29
|
-
<dt><%= Spree.t(:average_order_value) %>:</dt>
|
30
|
-
<dd><%= @user.display_average_order_value.to_html %></dd>
|
31
|
-
<dt><%= Spree.t(:member_since) %>:</dt>
|
32
|
-
<dd><%= l @user.created_at.to_date %></dd>
|
33
|
-
</dl>
|
34
|
-
</fieldset>
|
35
|
-
</nav>
|
2
|
+
<ul class="nav nav-pills nav-stacked" data-hook="admin_user_tab_options">
|
3
|
+
<li<%== ' class="active"' if current == :account %>>
|
4
|
+
<%= link_to_with_icon 'user', Spree.t(:"admin.user.account"), edit_admin_user_path(@user) %>
|
5
|
+
</li>
|
6
|
+
<li<%== ' class="active"' if current == :address %>>
|
7
|
+
<%= link_to_with_icon 'user', Spree.t(:"admin.user.addresses"), addresses_admin_user_path(@user) %>
|
8
|
+
</li>
|
9
|
+
<li<%== ' class="active"' if current == :orders %>>
|
10
|
+
<%= link_to_with_icon 'shopping-cart', Spree.t(:"admin.user.orders"), orders_admin_user_path(@user) %>
|
11
|
+
</li>
|
12
|
+
<li<%== ' class="active"' if current == :items %>>
|
13
|
+
<%= link_to_with_icon 'edit', Spree.t(:"admin.user.items"), items_admin_user_path(@user) %>
|
14
|
+
</li>
|
15
|
+
</ul>
|
36
16
|
<% end %>
|
@@ -1,8 +1,4 @@
|
|
1
1
|
<% content_for :page_actions do %>
|
2
|
-
|
3
|
-
|
4
|
-
</li>
|
5
|
-
<li>
|
6
|
-
<%= button_link_to Spree.t(:create_new_order), spree.new_admin_order_path(user_id: @user.id), :icon => 'plus' %>
|
7
|
-
</li>
|
2
|
+
<%= button_link_to Spree.t(:back_to_users_list), spree.admin_users_path, class: 'btn-primary', icon: 'chevron-left' %>
|
3
|
+
<%= button_link_to Spree.t(:create_new_order), spree.new_admin_order_path(user_id: @user.id), class: "btn-success", icon: 'add' %>
|
8
4
|
<% end %>
|
@@ -1,24 +1,25 @@
|
|
1
1
|
<% content_for :page_title do %>
|
2
|
-
<%= link_to "#{
|
2
|
+
<%= link_to "#{@user.email}", edit_admin_user_url(@user) %> / <%= Spree.t(:editing_resource, resource: Spree::Address.model_name.human(count: :many)) %>
|
3
3
|
<% end %>
|
4
4
|
|
5
5
|
<%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :address } %>
|
6
6
|
<%= render :partial => 'spree/admin/users/user_page_actions' %>
|
7
7
|
|
8
|
-
<
|
9
|
-
<legend><%= Spree.t('addresses', :scope => 'admin.user') %></legend>
|
10
|
-
|
8
|
+
<div data-hook="admin_user_addresses" id="admin_user_edit_addresses">
|
11
9
|
<div data-hook="admin_user_edit_form_header">
|
12
|
-
<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
|
10
|
+
<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @user } %>
|
13
11
|
</div>
|
14
12
|
|
15
13
|
<div data-hook="admin_user_address_edit_form">
|
16
14
|
<%= form_for [:admin, @user], as: :user, url: addresses_admin_user_url(@user), method: :put do |f| %>
|
15
|
+
|
17
16
|
<%= render :partial => 'addresses_form', :locals => { :f => f } %>
|
18
17
|
|
19
|
-
<div data-hook="admin_user_edit_form_button">
|
18
|
+
<div class="form-actions text-center well" data-hook="admin_user_edit_form_button">
|
20
19
|
<%= render :partial => 'spree/admin/shared/edit_resource_links', :locals => { :collection_url => admin_users_url } %>
|
21
20
|
</div>
|
22
21
|
<% end %>
|
23
22
|
</div>
|
24
|
-
</
|
23
|
+
</div>
|
24
|
+
|
25
|
+
<%= render 'spree/admin/users/lifetime_stats' %>
|
@@ -1,55 +1,72 @@
|
|
1
1
|
<% content_for :page_title do %>
|
2
|
-
<%=
|
2
|
+
<%= Spree.t(:editing_user) %> <%= @user.email %>
|
3
3
|
<% end %>
|
4
4
|
|
5
5
|
<%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :account } %>
|
6
6
|
<%= render :partial => 'spree/admin/users/user_page_actions' %>
|
7
7
|
|
8
|
-
<
|
9
|
-
<
|
10
|
-
|
11
|
-
|
12
|
-
|
8
|
+
<div data-hook="admin_user_edit_general_settings" class="panel panel-default">
|
9
|
+
<div class="panel-heading">
|
10
|
+
<h1 class="panel-title">
|
11
|
+
<%= Spree.t(:general_settings) %>
|
12
|
+
</h1>
|
13
13
|
</div>
|
14
14
|
|
15
|
-
<div
|
16
|
-
|
17
|
-
<%= render :partial => '
|
15
|
+
<div class="panel-body">
|
16
|
+
<div data-hook="admin_user_edit_form_header">
|
17
|
+
<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @user } %>
|
18
|
+
</div>
|
18
19
|
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
20
|
+
<div data-hook="admin_user_edit_form">
|
21
|
+
<%= form_for [:admin, @user], as: :user, url: admin_user_url(@user), method: :put do |f| %>
|
22
|
+
<%= render :partial => 'form', :locals => { :f => f } %>
|
23
|
+
|
24
|
+
<div data-hook="admin_user_edit_form_button">
|
25
|
+
<%= render :partial => 'spree/admin/shared/edit_resource_links', :locals => { :collection_url => admin_users_url } %>
|
26
|
+
</div>
|
27
|
+
<% end %>
|
28
|
+
</div>
|
23
29
|
</div>
|
24
|
-
</
|
30
|
+
</div>
|
25
31
|
|
26
|
-
<
|
27
|
-
<
|
32
|
+
<div data-hook="admin_user_api_key" id="admin_user_edit_api_key" class="panel panel-default">
|
33
|
+
<div class="panel-heading">
|
34
|
+
<h1 class="panel-title">
|
35
|
+
<%= Spree.t('access', :scope => 'api') %>
|
36
|
+
</h1>
|
37
|
+
</div>
|
28
38
|
|
29
|
-
|
30
|
-
|
31
|
-
<div
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
39
|
+
<div class="panel-body">
|
40
|
+
<% if @user.spree_api_key.present? %>
|
41
|
+
<div class="form-group">
|
42
|
+
<div id="current-api-key">
|
43
|
+
<label><%= Spree.t('key', :scope => 'api') %>: </label>
|
44
|
+
<strong><%= @user.spree_api_key %></strong>
|
45
|
+
</div>
|
46
|
+
</div>
|
47
|
+
<div class="form-actions">
|
48
|
+
<%= form_tag spree.clear_api_key_admin_user_path(@user), :method => :put do %>
|
49
|
+
<%= button Spree.t('clear_key', :scope => 'api'), 'delete', 'submit', class: "btn-danger" %>
|
50
|
+
<% end %>
|
37
51
|
|
38
|
-
|
52
|
+
<span class="or"><%= Spree.t(:or)%></span>
|
39
53
|
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
54
|
+
<%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %>
|
55
|
+
<%= button Spree.t('regenerate_key', :scope => 'api'), 'save' %>
|
56
|
+
<% end %>
|
57
|
+
</div>
|
44
58
|
|
45
|
-
|
59
|
+
<% else %>
|
46
60
|
|
47
|
-
|
61
|
+
<div class="alert alert-warning"><%= Spree.t('no_key', :scope => 'api') %></div>
|
48
62
|
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
</
|
63
|
+
<div class="form-actions">
|
64
|
+
<%= form_tag spree.generate_api_key_admin_user_path(@user), :method => :put do %>
|
65
|
+
<%= button Spree.t('generate_key', :scope => 'api'), 'key' %>
|
66
|
+
<% end %>
|
67
|
+
</div>
|
68
|
+
<% end %>
|
69
|
+
</div>
|
70
|
+
</div>
|
71
|
+
|
72
|
+
<%= render 'spree/admin/users/lifetime_stats' %>
|
@@ -1,29 +1,61 @@
|
|
1
1
|
<% content_for :page_title do %>
|
2
|
-
<%= Spree.t(:
|
2
|
+
<%= Spree.t(:users) %>
|
3
3
|
<% end %>
|
4
4
|
|
5
5
|
<% content_for :page_actions do %>
|
6
|
-
|
7
|
-
<%= button_link_to Spree.t(:new_user), new_admin_user_url, :icon => 'plus', :id => 'admin_new_user_link' %>
|
8
|
-
</li>
|
6
|
+
<%= button_link_to Spree.t(:new_user), new_admin_user_url, :class => "btn-success", :icon => 'add', :id => 'admin_new_user_link' %>
|
9
7
|
<% end %>
|
10
8
|
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
9
|
+
<% content_for :table_filter_title do %>
|
10
|
+
<%= Spree.t(:search) %>
|
11
|
+
<% end %>
|
12
|
+
|
13
|
+
<% content_for :table_filter do %>
|
14
|
+
<div data-hook="admin_users_index_search">
|
15
|
+
<%= search_form_for [:admin, @search], url: admin_users_url do |f| %>
|
16
|
+
<div class="form-group">
|
17
|
+
<%= f.label Spree.t(:email) %>
|
18
|
+
<%= f.text_field :email_cont, class: "form-control js-quick-search-target" %>
|
19
|
+
</div>
|
20
|
+
<div class="row">
|
21
|
+
<div class="col-md-6">
|
22
|
+
<div class="form-group">
|
23
|
+
<%= f.label Spree.t(:first_name) %>
|
24
|
+
<%= f.text_field :bill_address_firstname_cont, :class => 'form-control' %>
|
25
|
+
</div>
|
26
|
+
</div>
|
27
|
+
<div class="col-md-6">
|
28
|
+
<div class="form-group">
|
29
|
+
<%= f.label Spree.t(:last_name) %>
|
30
|
+
<%= f.text_field :bill_address_lastname_cont, :class => 'form-control' %>
|
31
|
+
</div>
|
32
|
+
</div>
|
33
|
+
</div>
|
34
|
+
<div class="form-group">
|
35
|
+
<%= f.label Spree.t(:company) %>
|
36
|
+
<%= f.text_field :bill_address_company_cont, :class => 'form-control' %>
|
37
|
+
</div>
|
38
|
+
<div data-hook="admin_users_index_search_buttons" class="form-actions">
|
39
|
+
<%= button Spree.t(:search), 'search' %>
|
40
|
+
</div>
|
41
|
+
<% end %>
|
42
|
+
</div>
|
43
|
+
<% end %>
|
44
|
+
|
45
|
+
<table class="table" id="listing_users" data-hook>
|
16
46
|
<thead>
|
17
47
|
<tr data-hook="admin_users_index_headers">
|
18
|
-
<th
|
48
|
+
<th>
|
49
|
+
<%= sort_link @search,:email, Spree.t(:user), {}, {:title => 'users_email_title'} %>
|
50
|
+
</th>
|
19
51
|
<th data-hook="admin_users_index_header_actions" class="actions"></th>
|
20
52
|
</tr>
|
21
53
|
</thead>
|
22
54
|
<tbody>
|
23
55
|
<% @users.each do |user|%>
|
24
|
-
<tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows"
|
56
|
+
<tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows">
|
25
57
|
<td class='user_email'><%=link_to user.email, edit_admin_user_url(user) %></td>
|
26
|
-
<td data-hook="admin_users_index_row_actions" class="actions">
|
58
|
+
<td data-hook="admin_users_index_row_actions" class="actions actions-2 text-right">
|
27
59
|
<%= link_to_edit user, :no_text => true %>
|
28
60
|
<%= link_to_delete user, :no_text => true %>
|
29
61
|
</td>
|
@@ -33,21 +65,3 @@
|
|
33
65
|
</table>
|
34
66
|
|
35
67
|
<%= paginate @users %>
|
36
|
-
|
37
|
-
<% content_for :sidebar_title do %>
|
38
|
-
<%= Spree.t(:search) %>
|
39
|
-
<% end %>
|
40
|
-
|
41
|
-
<% content_for :sidebar do %>
|
42
|
-
<div class="box align-center" data-hook="admin_users_index_search">
|
43
|
-
<%= search_form_for [:admin, @search], url: admin_users_url do |f| %>
|
44
|
-
<div class="field">
|
45
|
-
<%= f.label :email_cont, Spree.t(:email) %> <br>
|
46
|
-
<%= f.text_field :email_cont, :class => 'fullwidth' %>
|
47
|
-
</div>
|
48
|
-
<div data-hook="admin_users_index_search_buttons">
|
49
|
-
<%= button Spree.t(:search), 'search' %>
|
50
|
-
</div>
|
51
|
-
<% end %>
|
52
|
-
</div>
|
53
|
-
<% end %>
|
@@ -1,28 +1,16 @@
|
|
1
1
|
<% content_for :page_title do %>
|
2
|
-
<%= link_to "#{
|
2
|
+
<%= link_to "#{@user.email}", edit_admin_user_url(@user) %> / <%= Spree.t(:"admin.user.items_purchased") %>
|
3
3
|
<% end %>
|
4
4
|
|
5
5
|
<%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :items } %>
|
6
6
|
<%= render :partial => 'spree/admin/users/user_page_actions' %>
|
7
7
|
|
8
|
-
<fieldset data-hook="admin_user_items_purchased"
|
9
|
-
<legend><%= Spree.t(:"admin.user.items_purchased") %></legend>
|
10
|
-
|
8
|
+
<fieldset data-hook="admin_user_items_purchased">
|
11
9
|
<%= paginate @orders %>
|
12
10
|
|
13
11
|
<% if @orders.any? %>
|
14
12
|
<%# TODO add search interface %>
|
15
|
-
<table class="stock-contents
|
16
|
-
<colgroup>
|
17
|
-
<col style="width: 10%;" />
|
18
|
-
<col style="width: 10%;" />
|
19
|
-
<col style="width: 30%;" />
|
20
|
-
<col style="width: 8%;" />
|
21
|
-
<col style="width: 8%;" />
|
22
|
-
<col style="width: 10%;" />
|
23
|
-
<col style="width: 14%;" />
|
24
|
-
</colgroup>
|
25
|
-
|
13
|
+
<table class="table table-condensed table-bordered stock-contents" id="listing_items" data-hook="stock-contents">
|
26
14
|
<thead>
|
27
15
|
<th><%= sort_link @search, :completed_at, I18n.t(:completed_at, :scope => 'activerecord.attributes.spree/order'), {}, {:title => 'orders_completed_at_title'} %></th>
|
28
16
|
<th colspan=2><%= Spree.t(:description) %></th>
|
@@ -32,12 +20,11 @@
|
|
32
20
|
<th><%= sort_link @search, :state, I18n.t(:state, :scope => 'activerecord.attributes.spree/order'), {}, {:title => 'orders_state_title'} %></th>
|
33
21
|
<th><%= sort_link @search, :number, Spree.t(:order_num, :scope => 'admin.user'), {}, {:title => 'orders_number_title'} %></th>
|
34
22
|
</thead>
|
35
|
-
|
36
23
|
<tbody>
|
37
24
|
<% @orders.each do |order| %>
|
38
25
|
<% order.line_items.each do |item| %>
|
39
26
|
<tr class="stock-item" data-item-quantity="<%= item.quantity %>">
|
40
|
-
<td class="
|
27
|
+
<td class="order-completed-at"><%= l(order.completed_at.to_date) if order.completed_at %></td>
|
41
28
|
<td class="item-image">
|
42
29
|
<%= mini_image(item.variant) %>
|
43
30
|
</td>
|
@@ -47,10 +34,10 @@
|
|
47
34
|
<strong><%= Spree.t(:sku) %>:</strong> <%= item.variant.sku %>
|
48
35
|
<% end %>
|
49
36
|
</td>
|
50
|
-
<td class="
|
51
|
-
<td class="
|
52
|
-
<td class="
|
53
|
-
<td class="
|
37
|
+
<td class="item-price"><%= item.single_money.to_html %></td>
|
38
|
+
<td class="item-quantity"><%= item.quantity %></td>
|
39
|
+
<td class="item-total"><%= item.money.to_html %></td>
|
40
|
+
<td class="order-state">
|
54
41
|
<div class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></div>
|
55
42
|
<% if order.payment_state %>
|
56
43
|
<div class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) %></div>
|
@@ -59,16 +46,18 @@
|
|
59
46
|
<div class="state <%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") %></div>
|
60
47
|
<% end %>
|
61
48
|
</td>
|
62
|
-
<td class="
|
49
|
+
<td class="order-number"><%= link_to order.number, edit_admin_order_url(order) %></td>
|
63
50
|
</tr>
|
64
51
|
<% end %>
|
65
52
|
<% end %>
|
66
53
|
</table>
|
67
54
|
<% else %>
|
68
|
-
<div class="
|
69
|
-
<%= Spree.t(:no_resource_found, resource:
|
55
|
+
<div class="alert alert-info no-objects-found">
|
56
|
+
<%= Spree.t(:no_resource_found, resource: Spree::Order.model_name.human(count: :many)) %>,
|
70
57
|
<%= link_to Spree.t(:add_one), spree.new_admin_order_path %>!
|
71
58
|
</div>
|
72
59
|
<% end %>
|
73
60
|
<%= paginate @orders %>
|
74
61
|
</fieldset>
|
62
|
+
|
63
|
+
<%= render 'spree/admin/users/lifetime_stats' %>
|
@@ -2,14 +2,8 @@
|
|
2
2
|
<%= Spree.t(:new_user) %>
|
3
3
|
<% end %>
|
4
4
|
|
5
|
-
<% content_for :page_actions do %>
|
6
|
-
<li>
|
7
|
-
<%= button_link_to Spree.t(:back_to_users_list), spree.admin_users_path, :icon => 'arrow-left' %>
|
8
|
-
</li>
|
9
|
-
<% end %>
|
10
|
-
|
11
5
|
<div data-hook="admin_user_new_form_header">
|
12
|
-
<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
|
6
|
+
<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @user } %>
|
13
7
|
</div>
|
14
8
|
|
15
9
|
<div data-hook="admin_user_new_form">
|
@@ -1,24 +1,16 @@
|
|
1
1
|
<% content_for :page_title do %>
|
2
|
-
<%= link_to "#{
|
2
|
+
<%= link_to "#{@user.email}", edit_admin_user_url(@user) %> / <%= Spree.t(:"admin.user.order_history") %>
|
3
3
|
<% end %>
|
4
4
|
|
5
5
|
<%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :orders } %>
|
6
6
|
<%= render :partial => 'spree/admin/users/user_page_actions' %>
|
7
7
|
|
8
|
-
<fieldset data-hook="admin_user_order_history"
|
9
|
-
<legend><%= Spree.t(:"admin.user.order_history") %></legend>
|
10
|
-
|
8
|
+
<fieldset data-hook="admin_user_order_history">
|
11
9
|
<%= paginate @orders %>
|
12
10
|
|
13
11
|
<% if @orders.any? %>
|
14
12
|
<%# TODO add search interface %>
|
15
|
-
<table class="
|
16
|
-
<colgroup>
|
17
|
-
<col style="width: 25%;">
|
18
|
-
<col style="width: 25%;">
|
19
|
-
<col style="width: 25%;">
|
20
|
-
<col style="width: 25%;">
|
21
|
-
</colgroup>
|
13
|
+
<table class="table table-condensed table-bordered" id="listing_orders" data-hook>
|
22
14
|
<thead>
|
23
15
|
<tr data-hook="admin_orders_index_headers">
|
24
16
|
<th><%= sort_link @search, :completed_at, I18n.t(:completed_at, :scope => 'activerecord.attributes.spree/order'), {}, {:title => 'orders_completed_at_title'} %></th>
|
@@ -30,9 +22,9 @@
|
|
30
22
|
<tbody>
|
31
23
|
<% @orders.each do |order| %>
|
32
24
|
<tr data-hook="admin_orders_index_rows" class="state-<%= order.state.downcase %> <%= cycle('odd', 'even') %>">
|
33
|
-
<td class="
|
34
|
-
<td class="
|
35
|
-
<td class="
|
25
|
+
<td class="order-completed-at"><%= l(order.completed_at.to_date) if order.completed_at %></td>
|
26
|
+
<td class="order-number"><%= link_to order.number, edit_admin_order_path(order) %></td>
|
27
|
+
<td class="order-state">
|
36
28
|
<div class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></div>
|
37
29
|
<% if order.payment_state %>
|
38
30
|
<div class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) %></div>
|
@@ -41,17 +33,19 @@
|
|
41
33
|
<div class="state <%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") %></div>
|
42
34
|
<% end %>
|
43
35
|
</td>
|
44
|
-
<td class="
|
36
|
+
<td class="order-total"><%= order.display_total.to_html %></td>
|
45
37
|
</tr>
|
46
38
|
<% end %>
|
47
39
|
</tbody>
|
48
40
|
</table>
|
49
41
|
<% else %>
|
50
|
-
<div class="
|
51
|
-
<%= Spree.t(:no_resource_found, resource:
|
42
|
+
<div class="alert alert-info no-objects-found">
|
43
|
+
<%= Spree.t(:no_resource_found, resource: Spree::Order.model_name.human(count: :many)) %>,
|
52
44
|
<%= link_to Spree.t(:add_one), spree.new_admin_order_path %>!
|
53
45
|
</div>
|
54
46
|
<% end %>
|
55
47
|
|
56
48
|
<%= paginate @orders %>
|
57
49
|
</fieldset>
|
50
|
+
|
51
|
+
<%= render 'spree/admin/users/lifetime_stats' %>
|
@@ -1,25 +1,23 @@
|
|
1
1
|
<script type='text/template' id='variant_autocomplete_template'>
|
2
|
-
<div class='variant-autocomplete-item'>
|
3
|
-
<figure class='variant-image'>
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
2
|
+
<div class='variant-autocomplete-item media'>
|
3
|
+
<figure class='variant-image media-left'>
|
4
|
+
<span class="thumbnail no-marginb">
|
5
|
+
{{#if variant.image }}
|
6
|
+
<img src='{{variant.image}}' />
|
7
|
+
{{ else }}
|
8
|
+
<img src='<%= image_path("noimage/mini.png") %>' />
|
9
|
+
{{/if}}
|
10
|
+
</span>
|
9
11
|
</figure>
|
10
12
|
|
11
|
-
<div class='variant-details'>
|
12
|
-
|
13
|
-
<h6 class="variant-name">{{variant.name}}</h6>
|
14
|
-
|
13
|
+
<div class='variant-details media-body'>
|
14
|
+
<h5 class="variant-name media-heading">{{variant.name}}</h5>
|
15
15
|
{{#if variant.option_values}}
|
16
16
|
{{#each variant.option_values}}
|
17
|
-
<strong>{{this.option_type_presentation}}:</strong> {{this.presentation}}<br
|
17
|
+
<strong>{{this.option_type_presentation}}:</strong> {{this.presentation}}<br/>
|
18
18
|
{{/each}}
|
19
19
|
{{/if}}
|
20
|
-
|
21
20
|
<strong><%= Spree.t(:sku) %>:</strong> {{variant.sku}}
|
22
|
-
|
23
21
|
</div>
|
24
22
|
</div>
|
25
|
-
</script>
|
23
|
+
</script>
|
@@ -1,49 +1,46 @@
|
|
1
1
|
<script type='text/template' id='variant_line_items_autocomplete_stock_template'>
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
<
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
<
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
<td>
|
21
|
-
It doesnt track inventory
|
2
|
+
|
3
|
+
<label><%= Spree.t(:select_stock) %></label>
|
4
|
+
|
5
|
+
<table class="stock-levels table table-bordered" data-hook="stock-levels">
|
6
|
+
<thead>
|
7
|
+
<th><%= Spree.t(:name) %></th>
|
8
|
+
<th class="text-center"><%= Spree.t(:count_on_hand) %></th>
|
9
|
+
<th class="text-center"><%= Spree.t(:quantity) %></th>
|
10
|
+
<th></th>
|
11
|
+
</thead>
|
12
|
+
<tbody>
|
13
|
+
<tr>
|
14
|
+
<td>{{variant.name}}</td>
|
15
|
+
{{#if variant.track_inventory}}
|
16
|
+
{{#if variant.total_on_hand}}
|
17
|
+
<td class="text-center">{{variant.total_on_hand}}</td>
|
18
|
+
<td class="text-center">
|
19
|
+
<input class="quantity form-control" id="variant_quantity" data-variant-id="{{variant.id}}" type="number" min="1" value="1">
|
22
20
|
</td>
|
23
|
-
<td>
|
24
|
-
<
|
25
|
-
|
26
|
-
|
27
|
-
<button class="add_variant no-text fa fa-plus icon_link with-tip" data-variant-id="{{this.variant_id}}" title="<%= Spree.t(:add) %>" data-action="add"></button>
|
21
|
+
<td class="actions actions-1 text-center">
|
22
|
+
<button class="btn btn-sm btn-success add_variant with-tip" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
|
23
|
+
<span class="icon icon-add"></span>
|
24
|
+
</button>
|
28
25
|
</td>
|
29
26
|
{{else}}
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
<
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
</
|
47
|
-
</
|
48
|
-
</
|
27
|
+
<td class="text-center"><%= Spree.t(:out_of_stock) %></td>
|
28
|
+
<td class="text-center">0</td>
|
29
|
+
<td></td>
|
30
|
+
<td></td>
|
31
|
+
{{/if}}
|
32
|
+
{{else}}
|
33
|
+
<td class="text-center"><%= Spree.t(:doesnt_track_inventory) %></td>
|
34
|
+
<td class="text-center">
|
35
|
+
<input class="quantity form-control" id="variant_quantity" data-variant-id="{{variant.id}}" type="number" min="1" value="1">
|
36
|
+
</td>
|
37
|
+
<td class="actions actions-1 text-center">
|
38
|
+
<button class="btn btn-sm btn-success add_variant with-tip" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
|
39
|
+
<span class="icon icon-add"></span>
|
40
|
+
</button>
|
41
|
+
</td>
|
42
|
+
{{/if}}
|
43
|
+
</tr>
|
44
|
+
</tbody>
|
45
|
+
</table>
|
49
46
|
</script>
|