comee_core 0.2.16 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 406c93dca731f87dea5f764260975fb10ea432aa054d6b619faaf0a4430af097
-  data.tar.gz: ca8d491fc263c2cd7abc3618f8dc1a54ff544137674936527ed3e2511c299033
+  metadata.gz: 0a22a79a452e5e9f9f66bf84f7fd4d986765f2fe7d9fbc9e228b8cf6963a33d4
+  data.tar.gz: ca63072349143672a4e0e20eaf3ed5668414d1a36e7cebccea91efd9779c2f71
 SHA512:
-  metadata.gz: 9d77f8b9c8ab3e2dcf258faf3312a7f44698f608a7c59a7a024c3a361261b348f17c1868f7685579ffef5db0d63c1a76e95b2d81f8f1eca4c3cd2ef7216bbd37
-  data.tar.gz: c0ac3ee94586168c23566ca9ef133c4b092d66cf6ac764d152e1a5c8fb37f4ae051db50eaa4ab14f42efb7a4bb0198648a4e6d6a99c2f9fb60ce785f2f2b02c6
+  metadata.gz: b0c350b679889199287028a5ca3fe90e70f1b3f78ee9eb204793f782dbdea1880e878bae5b6715b0f00f148781fcdf950e1383c5818b47019d2159b8f5a440ae
+  data.tar.gz: e660b422111cb6e69c8befe2e0e8e2fc28a91b3fe9376fc491b7ac933db352eb31cb0977f28d8998d9499c3d0890f44a82dbbcdd0997fb2dbf8cb2b52b16219e

data/app/controllers/comee/core/customer_orders_controller.rb

@@ -58,7 +58,7 @@ module Comee
 
       def filter
         orders = CustomerOrder.includes(:client, :customer_order_items).ransack(params[:q]).result
-        render_content(orders)
+        render_content(orders, fields: ["client", "customer_order_items.unit"])
       end
 
       private

data/app/controllers/comee/core/sales_order_items_controller.rb

@@ -27,6 +27,12 @@ module Comee
         render_content(item)
       end
 
+      def activate
+        item = set_object
+        item.update(canceled: false)
+        render_content(item)
+      end
+
       def destroy
         Comee::Core::SalesOrderItem.destroy(params[:id])
         render json: {success: true}

data/app/controllers/comee/core/sales_orders_controller.rb

@@ -23,13 +23,19 @@ module Comee
         end
       end
 
+      def update
+        super do
+          {fields: ["client", "customer_order", "sales_order_items", "sales_order_items.product", "sales_order_items.unit"]}
+        end
+      end
+
       def filter
         data = SalesOrder.includes(
           :customer_order,
           :client,
           sales_order_items: :unit
         ).ransack(params[:q]).result
-        render_content(data)
+        render_content(data, fields: ["client", "customer_order", "sales_order_items.product", "sales_order_items.unit"])
       end
 
       def submit

data/app/controllers/concerns/comee/core/common.rb

@@ -61,13 +61,28 @@ module Comee
       end
 
       def create
-        obj = if block_given?
-                yield
-              else
-                @clazz.new(model_params)
-              end
+        obj = nil
+        options = {}
+        if block_given?
+          incoming = yield
+          if incoming.instance_of?(Array)
+            obj, options = incoming
+          elsif incoming.instance_of?(Hash)
+            obj = @clazz.new(model_params)
+            options = incoming
+          else
+            obj = incoming
+          end
+        else
+          obj = @clazz.new(model_params)
+        end
+
         if obj.save
-          render json: {success: true, data: serialize(obj)}, status: :created
+          result = {
+            success: true,
+            data: options.key?(:fields) ? serialize(obj, include: options[:fields]) : serialize(obj)
+          }
+          render json: result, status: :created
         else
           render json: {success: false, error: obj.errors.full_messages[0]}, status: :unprocessable_entity
         end
@@ -76,13 +91,28 @@ module Comee
       end
 
       def update
-        obj = if block_given?
-                yield
-              else
-                obj = @obj
-              end
+        obj = nil
+        options = {}
+        if block_given?
+          incoming = yield
+          if incoming.instance_of?(Array)
+            obj, options = incoming
+          elsif incoming.instance_of?(Hash)
+            obj = set_object
+            options = incoming
+          else
+            obj = incoming
+          end
+        else
+          obj = set_object
+        end
+
         if obj.update(model_params)
-          render json: {success: true, data: serialize(obj)}
+          result = {
+            success: true,
+            data: options.key?(:fields) ? serialize(obj, include: options[:fields]) : serialize(obj)
+          }
+          render json: result
         else
           render json: {success: false, error: obj.errors.full_messages[0]}, status: :unprocessable_entity
         end

data/config/routes.rb

@@ -114,6 +114,7 @@ Comee::Core::Engine.routes.draw do
     member do
       post "suggest", controller: :sales_order_items, action: :suggest_values
       post "cancel"
+      post "activate"
     end
   end
   resources :shipment_items do

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.16".freeze
+    VERSION = "0.2.18".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.18
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-12 00:00:00.000000000 Z
+date: 2024-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers