From 4bc578f38f755f956b444cecd422cd72ec49b27e Mon Sep 17 00:00:00 2001 From: Ahmed Ejaz Date: Sun, 16 Feb 2025 01:54:56 +0500 Subject: [PATCH] restrict page sections from supplier --- app/views/spree/admin/orders/_form.html.haml | 27 ++++++++++--------- .../spree/admin/orders/_shipment.html.haml | 4 +-- .../spree/admin/orders/_table_row.html.haml | 2 +- app/views/spree/admin/orders/edit.html.haml | 6 +++-- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/app/views/spree/admin/orders/_form.html.haml b/app/views/spree/admin/orders/_form.html.haml index 79b86cbbfe..4f1866f330 100644 --- a/app/views/spree/admin/orders/_form.html.haml +++ b/app/views/spree/admin/orders/_form.html.haml @@ -8,23 +8,24 @@ - if @order.shipments.any? = render :partial => "spree/admin/orders/shipment", :collection => @order.shipments, :locals => { :order => @order } - - if @order.line_items.exists? - = render partial: "spree/admin/orders/note", locals: { order: @order } + - if spree_current_user.can_manage_orders? + - if @order.line_items.exists? + = render partial: "spree/admin/orders/note", locals: { order: @order } - = render :partial => "spree/admin/orders/_form/adjustments", :locals => { :adjustments => @order.line_item_adjustments, :title => t(".line_item_adjustments")} - = render :partial => "spree/admin/orders/_form/adjustments", :locals => { :adjustments => order_adjustments_for_display(@order), :title => t(".order_adjustments")} + = render :partial => "spree/admin/orders/_form/adjustments", :locals => { :adjustments => @order.line_item_adjustments, :title => t(".line_item_adjustments")} + = render :partial => "spree/admin/orders/_form/adjustments", :locals => { :adjustments => order_adjustments_for_display(@order), :title => t(".order_adjustments")} - - if @order.line_items.exists? - %fieldset#order-total.no-border-bottom.order-details-total - %legend{ align: 'center' }= t(".order_total") - %span.order-total= @order.display_total + - if @order.line_items.exists? + %fieldset#order-total.no-border-bottom.order-details-total + %legend{ align: 'center' }= t(".order_total") + %span.order-total= @order.display_total - = form_for @order, url: spree.admin_order_url(@order), method: :put do |f| - = render partial: 'spree/admin/orders/_form/distribution_fields' + = form_for @order, url: spree.admin_order_url(@order), method: :put do |f| + = render partial: 'spree/admin/orders/_form/distribution_fields' - .filter-actions.actions{"ng-show" => "distributionChosen()"} - = button t(:update_and_recalculate_fees), 'icon-refresh' - = link_to_with_icon 'button icon-arrow-left', t(:back), spree.admin_orders_url + .filter-actions.actions{"ng-show" => "distributionChosen()"} + = button t(:update_and_recalculate_fees), 'icon-refresh' + = link_to_with_icon 'button icon-arrow-left', t(:back), spree.admin_orders_url = javascript_tag do var order_number = '#{@order.number}'; diff --git a/app/views/spree/admin/orders/_shipment.html.haml b/app/views/spree/admin/orders/_shipment.html.haml index a992fe38fd..6ed1042554 100644 --- a/app/views/spree/admin/orders/_shipment.html.haml +++ b/app/views/spree/admin/orders/_shipment.html.haml @@ -62,7 +62,7 @@ - if shipment.fee_adjustment.present? && shipment.can_modify? %td.actions - - if can? :update, shipment + - if can? :update, shipment.shipping_method = link_to '', '', :class => 'edit-method icon_link icon-edit no-text with-tip', :data => { :action => 'edit' }, :title => Spree.t('edit') %tr.edit-tracking.hidden.total @@ -86,7 +86,7 @@ = Spree.t(:no_tracking_present) %td.actions - - if can?(:update, shipment) && shipment.can_modify? + - if spree_current_user.can_manage_orders? && can?(:update, shipment) && shipment.can_modify? = link_to '', '', :class => 'edit-tracking icon_link icon-edit no-text with-tip', :data => { :action => 'edit' }, :title => Spree.t('edit') - if shipment.tracking.present? = link_to '', '', :class => 'delete-tracking icon_link icon-trash no-text with-tip', :data => { 'shipment-number' => shipment.number, :action => 'remove' }, :title => Spree.t('delete') diff --git a/app/views/spree/admin/orders/_table_row.html.haml b/app/views/spree/admin/orders/_table_row.html.haml index fd202f76d7..fa4916c729 100644 --- a/app/views/spree/admin/orders/_table_row.html.haml +++ b/app/views/spree/admin/orders/_table_row.html.haml @@ -51,5 +51,5 @@ = render ShipOrderComponent.new(order: order) = render partial: 'admin/shared/tooltip_button', locals: {button_class: "icon-road icon_link with-tip no-text", reflex_data_id: order.id.to_s, tooltip_text: t('spree.admin.orders.index.ship'), shipment: true} - - if order.payment_required? && order.pending_payments.reject(&:requires_authorization?).any? + - if can?(:update, Spree::Payment) && order.payment_required? && order.pending_payments.reject(&:requires_authorization?).any? = render partial: 'admin/shared/tooltip_button', locals: {button_class: "icon-capture icon_link no-text", button_reflex: "click->Admin::OrdersReflex#capture", reflex_data_id: order.id.to_s, tooltip_text: t('spree.admin.orders.index.capture')} diff --git a/app/views/spree/admin/orders/edit.html.haml b/app/views/spree/admin/orders/edit.html.haml index d1d0dc73a9..8d9023581d 100644 --- a/app/views/spree/admin/orders/edit.html.haml +++ b/app/views/spree/admin/orders/edit.html.haml @@ -6,14 +6,16 @@ - content_for :page_actions do - if can?(:fire, @order) %li= event_links(@order) - = render partial: 'spree/admin/shared/order_links' + - if spree_current_user.can_manage_orders? + = render partial: 'spree/admin/shared/order_links' - if can?(:admin, Spree::Order) %li %a.button.icon-arrow-left{icon: 'icon-arrow-left', href: admin_orders_path } = t(:back_to_orders_list) = render partial: "spree/admin/shared/order_page_title" -= render partial: "spree/admin/shared/order_tabs", locals: { current: 'Order Details' } +- if spree_current_user.can_manage_orders? + = render partial: "spree/admin/shared/order_tabs", locals: { current: 'Order Details' } %div = render partial: "spree/shared/error_messages", locals: { target: @order }