Skip to content

Commit

Permalink
SW-19456 - Fix chart scaling, save user input for Customer Streams
Browse files Browse the repository at this point in the history
  • Loading branch information
jenskueper committed Sep 1, 2017
1 parent 9bfba40 commit 6b7d935
Show file tree
Hide file tree
Showing 9 changed files with 233 additions and 117 deletions.
8 changes: 7 additions & 1 deletion snippets/backend/customer/view/main.ini
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ customer_count_suffix = "Customer(s)"
customer_group = "Customer group"
customer_refreshed = "Customers successfully analyzed"
customer_searchterm_condition = "Search term"
delete_confirm_text = "Are you sure you want to delete the selected stream?"
delete_confirm_title = "Delete stream"
descending = "Descending"
desktop = "Dekstop"
dynamic_stream = "Dynamic stream"
Expand Down Expand Up @@ -80,7 +82,7 @@ is_customer_since_condition = "Is customer since"
is_customer_since_condition_label = "Customer since date"
is_in_customer_group_condition = "Is in customer group"
is_in_customer_group_condition_selection = "Assigned to one of the following customer groups"
items = "items"
items = "Items"
items_per_page = "Items per page"
last_analyse = "Last analysis at: "
last_order_time = "Last order time"
Expand Down Expand Up @@ -167,6 +169,7 @@ total_order_amount_condition_input = "Has a total order value of"
tuesday = "Tuesday"
type = "Type"
unassigned_stream = "Without Customer Stream"
unsaved_stream = "Please save the stream before you add a new one."
view_chart = "Stream revenue"
view_chart_stream = "Revenue comparison"
view_table = "Overview"
Expand Down Expand Up @@ -227,6 +230,8 @@ customer_count_suffix = "Kunde(n)"
customer_group = "Kundengruppe"
customer_refreshed = "Kunden wurden erfolgreich analysiert"
customer_searchterm_condition = "Suchbegriff"
delete_confirm_text = "Bist du sicher, dass du den markierten Stream löschen möchtest?"
delete_confirm_title = "Stream löschen"
descending = "Absteigend"
desktop = "Dektop"
dynamic_stream = "Dynamischer Stream"
Expand Down Expand Up @@ -349,6 +354,7 @@ total_order_amount_condition_input = "Hat einen Gesamtbestelltwert von"
tuesday = "Dienstag"
type = "Typ"
unassigned_stream = "Ohne Customer Stream"
unsaved_stream = "Bitte speichere den Stream, bevor du neue anlegst."
view_chart = "Streamumsatz"
view_chart_stream = "Umsatzvergleich"
view_table = "Übersicht"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ Ext.define('Shopware.grid.Controller', {
return false;
}

if (!me.hasModelAction(record, 'destroy') || record.getId() === null) {
if (!me.hasModelAction(record, 'destroy')) {
grid.getStore().remove(record);
return true;
}
Expand Down
Loading

0 comments on commit 6b7d935

Please sign in to comment.