diff --git a/plugins/orders/lib/ext/profile.rb b/plugins/orders/lib/ext/profile.rb
index 03cdcff..fdf2186 100644
--- a/plugins/orders/lib/ext/profile.rb
+++ b/plugins/orders/lib/ext/profile.rb
@@ -12,10 +12,7 @@ subclass.class_eval do
has_many :ordered_items, -> { order 'name ASC' }, through: :orders, source: :items
has_many :sales_consumers, through: :sales, source: :consumer
- has_many :purchases_consumers, through: :sales, source: :consumer
-
- has_many :sales_profiles, through: :sales, source: :profile
- has_many :purchases_profiles, through: :sales, source: :profile
+ has_many :purchases_suppliers, through: :purchases, source: :profile
end
end
@@ -30,12 +27,12 @@ class Profile
def sales_all_consumers
consumers = self.sales_consumers.order 'name ASC'
- consumers.concat self.suppliers.except_self.order('name ASC') if self.respond_to? :suppliers
+ consumers.concat self.consumers.except_self.order('name ASC') if self.respond_to? :consumers
consumers.uniq
end
- def purchases_all_consumers
- consumers = self.purchases_consumers.order 'name ASC'
- consumers.concat self.consumers.except_self.order('name ASC') if self.respond_to? :consumers
+ def purchases_all_suppliers
+ consumers = self.purchases_suppliers.order 'name ASC'
+ consumers.concat self.suppliers.except_self.order('name ASC') if self.respond_to? :suppliers
consumers.uniq
end
diff --git a/plugins/orders/views/orders_plugin/mailer/order_confirmation.html.erb b/plugins/orders/views/orders_plugin/mailer/order_confirmation.html.erb
index 5ee63eb..aa78ba4 100644
--- a/plugins/orders/views/orders_plugin/mailer/order_confirmation.html.erb
+++ b/plugins/orders/views/orders_plugin/mailer/order_confirmation.html.erb
@@ -28,10 +28,11 @@
<%= render "orders_plugin_order/show_simple", order: @order, actor_name: :consumer %>
+
<%= t('orders_plugin.views.mailer.order_confirmation.your_order_can_be_che') %>
<%= link_to t('orders_plugin.views.mailer.order_confirmation.order_code_of_profile') % {code: @order.code, name: @profile.name },
- {controller: :orders_cycle_plugin_order, action: :edit, profile: @profile.identifier, id: @order.id, protocol: "http"} %>
+ {controller: :orders_plugin_order, action: :edit, profile: @profile.identifier, id: @order.id, protocol: "http"} %>
diff --git a/plugins/orders/views/orders_plugin_admin/_index.html.erb b/plugins/orders/views/orders_plugin_admin/_index.html.erb
deleted file mode 100644
index 12ca3ce..0000000
--- a/plugins/orders/views/orders_plugin_admin/_index.html.erb
+++ /dev/null
@@ -1,26 +0,0 @@
-
<%= t('orders_plugin.lib.plugin.panel_button') %>
-
-<%= button :back, _('Back to control panel'), controller: 'profile_editor' %>
-
-
- <% if @purchases.present? and @sales.present? %>
-
- <% end %>
-
- <% if @purchases.present? %>
-
- <%= render 'orders_plugin_admin/purchases', actors: profile.sales_all_consumers,
- orders_owner: profile, orders: @purchases, month: @purchases_month, year: @purchases_year, wireframe_size: false %>
-
- <% end %>
-
- <% if @sales.present? %>
-
- <%= render 'orders_plugin_admin/sales', actors: profile.purchases_all_consumers,
- orders_owner: profile, orders: @sales, month: @sales_month, year: @purchases_year, wireframe_size: false %>
-
- <% end %>
-
-
-
<%= check_box_tag "order_ids[]", order.id %>
-
-
- <%= order.code %>
- <%= order.send("#{other_actor_name}_data")[:name] %>
- <%= datetime_full order.created_at %>
- <%= datetime_full order.updated_at %>
- <%= order.total_price_as_currency_number actor_name %>
- <%= order_situation order %>
-
-
- <%= edit_arrow "#order-row-#{order.id}", true, class: 'actions' %>
-
-
-
-
-
- <% if edit %>
- <%= render 'orders_plugin_admin/edit', order: order, actor_name: actor_name, other_actor_name: other_actor_name %>
- <% end %>
-
-
-
-