orders_controller.rb in camaleon_ecommerce-1.2

- old
+ new

@@ -1,13 +1,5 @@
-=begin
-  Camaleon CMS is a content management system
-  Copyright (C) 2015 by Owen Peredo Diaz
-  Email: owenperedo@gmail.com
-  This program is free software: you can redistribute it and/or modify   it under the terms of the GNU Affero General Public License as  published by the Free Software Foundation, either version 3 of the  License, or (at your option) any later version.
-  This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  See the  GNU Affero General Public License (GPLv3) for more details.
-=end
 class Plugins::Ecommerce::Admin::OrdersController < Plugins::Ecommerce::AdminController
   before_action :set_order, except: [:index, :new] #, only: ['show', 'edit', 'update', 'destroy']
   before_action :set_order_bread
 
   def index
@@ -25,10 +17,11 @@
       orders = orders.joins(:details).where("plugins_order_details.phone LIKE ?", "%#{params[:p]}%")
     end
     if params[:s].present?
       orders = orders.where(status: params[:s])
     end
+    orders = orders.order('received_at desc')
     @orders = orders.paginate(:page => params[:page], :per_page => current_site.admin_per_page)
   end
 
   def show
     @order = @order.decorate
@@ -47,9 +40,10 @@
 
   def update
     @order.set_meta("billing_address", params[:order][:billing_address])
     @order.set_meta("shipping_address", params[:order][:shipping_address])
     @order.set_metas(params[:metas])
+    @order.update(params.require(:plugins_ecommerce_order).permit(:shipped_at))
     flash[:notice] = "#{t('plugin.ecommerce.message.order_updated', default: 'Order Updated')}"
     redirect_to action: :show, id: params[:id]
   end
 
   def destroy