simple items controllers

work-design · Dec 3, 2024 · 42f6eb7 · 42f6eb7
1 parent 25dc378
commit 42f6eb7
Show file tree

Hide file tree

Showing 28 changed files with 54 additions and 47 deletions.
diff --git a/app/controllers/trade/admin/desk/items_controller.rb b/app/controllers/trade/admin/desk/items_controller.rb
@@ -0,0 +1,31 @@
+module Trade::Admin
+  class Desk::ItemsController < ItemsController
+    before_action :set_desk
+
+    def index
+      q_params = {
+        status: ['init', 'checked', 'ordered']
+      }
+      q_params.merge! default_params
+      q_params.merge! params.permit(:cart_id, :order_id, :good_type, :good_id, :desk_id, :aim, :address_id, :status)
+
+      @items = Item.includes(:user, :item_promotes, :order).default_where(q_params).order(order_id: :desc).page(params[:page]).per(params[:per])
+    end
+
+    def history
+      q_params = {
+        status: ['deliverable', 'done']
+      }
+      q_params.merge! default_params
+      q_params.merge! params.permit(:cart_id, :order_id, :good_type, :good_id, :desk_id, :aim, :address_id, :status)
+
+      @items = Item.includes(:user, :item_promotes, :order).default_where(q_params).order(order_id: :desc).page(params[:page]).per(params[:per])
+    end
+
+    private
+    def set_desk
+      @desk = Space::Desk.default_where(default_params).find params[:desk_id]
+    end
+
+  end
+end
diff --git a/app/controllers/trade/admin/items_controller.rb b/app/controllers/trade/admin/items_controller.rb
@@ -36,28 +36,6 @@ def produce
       @items = Item.includes(:user, :item_promotes, :purchase_items, :order, :good).where.not(order_id: nil).default_where(q_params).order(id: :desc).page(params[:page]).per(params[:per])
     end
 
-    def desk
-      q_params = {
-        status: ['init', 'checked', 'ordered']
-      }
-      q_params.merge! default_params
-      q_params.merge! params.permit(:cart_id, :order_id, :good_type, :good_id, :desk_id, :aim, :address_id, :status)
-
-      @desk = Space::Desk.default_where(default_params).find params[:desk_id]
-      @items = Item.includes(:user, :item_promotes, :order).default_where(q_params).order(order_id: :desc).page(params[:page]).per(params[:per])
-    end
-
-    def desk_history
-      q_params = {
-        status: ['deliverable', 'done']
-      }
-      q_params.merge! default_params
-      q_params.merge! params.permit(:cart_id, :order_id, :good_type, :good_id, :desk_id, :aim, :address_id, :status)
-
-      @desk = Space::Desk.default_where(default_params).find params[:desk_id]
-      @items = Item.includes(:user, :item_promotes, :order).default_where(q_params).order(order_id: :desc).page(params[:page]).per(params[:per])
-    end
-
     def carts
       @carts = @item.carts.includes(:user, :member)
     end

diff --git a/app/views/trade/admin/desk/items/_base/_desk_bar.html.erb b/app/views/trade/admin/desk/items/_base/_desk_bar.html.erb
@@ -0,0 +1,10 @@
+<div class="tabs is-centered mb-3">
+  <ul>
+    <li class="<%= active_helper(action: 'index', active: 'is-active') %>">
+      <%= link_to t('.index.title'), { action: 'index' } %>
+    </li>
+    <li class="<%= active_helper(action: 'history', active: 'is-active') %>">
+      <%= link_to t('.history.title'), { action: 'history' } %>
+    </li>
+  </ul>
+</div>
diff --git a/...de/admin/items/_desk/_breadcrumb.html.erb → .../desk/items/_history/_breadcrumb.html.erb b/...de/admin/items/_desk/_breadcrumb.html.erb → .../desk/items/_history/_breadcrumb.html.erb
diff --git a/.../_desk_history/_index_item.html+phone.erb → ...items/_history/_index_item.html+phone.erb b/.../_desk_history/_index_item.html+phone.erb → ...items/_history/_index_item.html+phone.erb
diff --git a/...e/admin/items/_desk/_index_tbody.html.erb → ...desk/items/_history/_index_tbody.html.erb b/...e/admin/items/_desk/_index_tbody.html.erb → ...desk/items/_history/_index_tbody.html.erb
diff --git a/...e/admin/items/_desk/_index_thead.html.erb → ...desk/items/_history/_index_thead.html.erb b/...e/admin/items/_desk/_index_thead.html.erb → ...desk/items/_history/_index_thead.html.erb
diff --git a/...de/admin/items/_desk/_order_item.html.erb → .../desk/items/_history/_order_item.html.erb b/...de/admin/items/_desk/_order_item.html.erb → .../desk/items/_history/_order_item.html.erb
diff --git a/...e/admin/items/_desk/_order_tbody.html.erb → ...desk/items/_history/_order_tbody.html.erb b/...e/admin/items/_desk/_order_tbody.html.erb → ...desk/items/_history/_order_tbody.html.erb
diff --git a/...min/items/_desk_history/_tab_bar.html.erb → ...min/desk/items/_history/_tab_bar.html.erb b/...min/items/_desk_history/_tab_bar.html.erb → ...min/desk/items/_history/_tab_bar.html.erb
diff --git a/...ems/_desk_history/_top_bar.html+phone.erb → ...sk/items/_history/_top_bar.html+phone.erb b/...ems/_desk_history/_top_bar.html+phone.erb → ...sk/items/_history/_top_bar.html+phone.erb
diff --git a/.../items/_desk_history/_breadcrumb.html.erb → ...in/desk/items/_index/_breadcrumb.html.erb b/.../items/_desk_history/_breadcrumb.html.erb → ...in/desk/items/_index/_breadcrumb.html.erb
diff --git a/...dmin/items/_desk/_button_actions.html.erb → ...esk/items/_index/_button_actions.html.erb b/...dmin/items/_desk/_button_actions.html.erb → ...esk/items/_index/_button_actions.html.erb
diff --git a/...in/items/_desk/_index_item.html+phone.erb → ...k/items/_index/_index_item.html+phone.erb b/...in/items/_desk/_index_item.html+phone.erb → ...k/items/_index/_index_item.html+phone.erb
diff --git a/...items/_desk_history/_index_tbody.html.erb → ...n/desk/items/_index/_index_tbody.html.erb b/...items/_desk_history/_index_tbody.html.erb → ...n/desk/items/_index/_index_tbody.html.erb
diff --git a/...items/_desk_history/_index_thead.html.erb → ...n/desk/items/_index/_index_thead.html.erb b/...items/_desk_history/_index_thead.html.erb → ...n/desk/items/_index/_index_thead.html.erb
diff --git a/...rade/admin/items/_desk/_index_tr.html.erb → ...dmin/desk/items/_index/_index_tr.html.erb b/...rade/admin/items/_desk/_index_tr.html.erb → ...dmin/desk/items/_index/_index_tr.html.erb
@@ -11,15 +11,6 @@
       <%= button_to({ action: 'destroy', id: model.id }, method: :delete, aria: { label: t('.destroy.title') }, form: { data: { turbo_confirm: t('.destroy.confirm') } }, class: 'button is-small is-rounded is-light') do %>
         <i class="fa-solid fa-trash text-danger"></i>
       <% end %>
-      <%= button_to({ action: 'update', id: model.id }, method: :patch, params: { 'item[desk_id]': nil }, aria: { label: t('.destroy.title') }, form: { data: { turbo_confirm: t('.destroy.confirm') } }, class: 'button is-small is-rounded is-light') do %>
-        <i class="fa-solid fa-trash text-danger"></i>
-      <% end if false %>
-    </div>
-    <div data-show-target="item" class="visibility-hidden">
-      <%= link_to({ action: 'carts', id: model.id }, class: 'button is-small is-rounded is-light') do %>
-        <i class="fa-solid fa-cart-shopping text-info"></i>
-        <span class="ml-1"><%= t('.items.carts.title') %></span>
-      <% end %>
     </div>
   </td>
 </tr>
diff --git a/.../items/_desk_history/_order_item.html.erb → ...in/desk/items/_index/_order_item.html.erb b/.../items/_desk_history/_order_item.html.erb → ...in/desk/items/_index/_order_item.html.erb
diff --git a/...items/_desk_history/_order_tbody.html.erb → ...n/desk/items/_index/_order_tbody.html.erb b/...items/_desk_history/_order_tbody.html.erb → ...n/desk/items/_index/_order_tbody.html.erb
diff --git a/...trade/admin/items/_desk/_tab_bar.html.erb → ...admin/desk/items/_index/_tab_bar.html.erb b/...trade/admin/items/_desk/_tab_bar.html.erb → ...admin/desk/items/_index/_tab_bar.html.erb
diff --git a/...admin/items/_desk/_top_bar.html+phone.erb → ...desk/items/_index/_top_bar.html+phone.erb b/...admin/items/_desk/_top_bar.html+phone.erb → ...desk/items/_index/_top_bar.html+phone.erb
diff --git a/...e/admin/items/desk_history.html+phone.erb → ...e/admin/desk/items/history.html+phone.erb b/...e/admin/items/desk_history.html+phone.erb → ...e/admin/desk/items/history.html+phone.erb
diff --git a/app/views/trade/admin/items/desk.html.erb → ...s/trade/admin/desk/items/history.html.erb b/app/views/trade/admin/items/desk.html.erb → ...s/trade/admin/desk/items/history.html.erb
diff --git a/...ews/trade/admin/items/desk.html+phone.erb → ...ade/admin/desk/items/index.html+phone.erb b/...ews/trade/admin/items/desk.html+phone.erb → ...ade/admin/desk/items/index.html+phone.erb
diff --git a/...s/trade/admin/items/desk_history.html.erb → ...ews/trade/admin/desk/items/index.html.erb b/...s/trade/admin/items/desk_history.html.erb → ...ews/trade/admin/desk/items/index.html.erb
diff --git a/app/views/trade/admin/items/_base/_desk_bar.html.erb b/app/views/trade/admin/items/_base/_desk_bar.html.erb
diff --git a/config/locales/zh.controller.admin.yml b/config/locales/zh.controller.admin.yml
@@ -74,10 +74,6 @@ zh:
       items:
         index:
           title: 售出产品
-        desk:
-          title: 点单详情
-        desk_history:
-          title: 订单历史
         carts:
           title: 所在购物车
         compute:
@@ -222,3 +218,9 @@ zh:
       rent_charges:
         index:
           title: 租金规则
+      desk:
+        items:
+          index:
+            title: 点单详情
+          history:
+            title: 订单历史
diff --git a/config/routes.rb b/config/routes.rb
@@ -148,8 +148,6 @@
         collection do
           get :purchase
           get :produce
-          get 'desk/:desk_id' => :desk
-          get 'desk_history/:desk_id' => :desk_history
           post :trial
           post :batch_purchase
         end
@@ -170,6 +168,13 @@
           patch :deny
         end
       end
+      resources :desks, only: [] do
+        resources :items, controller: 'desk/items' do
+          collection do
+            get :history
+          end
+        end
+      end
     end
 
     namespace :trade, defaults: { business: 'trade' } do