dscf-marketplace 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1453b148008e135853ee34ec3c11a3e4ae92d1a63d692c46de443a2c65789f2a
-  data.tar.gz: 102476ba6b33b913f846a3ea25fe52728d3b1a5875fe18b98bcb20dadc39faa5
+  metadata.gz: 2118a22dd49f19b75b611bcdbb8ca04485e641b0eef6c1314d3557f8e2bd9144
+  data.tar.gz: 94e03aa2b185429dc02b0698fc3a39b4efb8ff497f473b23c81c9ed05c9f9407
 SHA512:
-  metadata.gz: a554fc5405b2a480cfc488ba0d5266b8219343549c6c873892d0b122f425e8643adeb27aaa4a056faa864cdb7af1d6562dcd125923cd1530812998242b8a7886
-  data.tar.gz: fe584405ecbfa49efd3a7c3de767d9c795c3dab1bc17342d5e422d8b986a56eaced5771729e7412636104ab9b793803106aa97437e95d74f0008d0bea1445c63
+  metadata.gz: e931358752fc3d8623e021bc95b0bd5ab40b66950aee72bc5ec2df3f3e4d66e49bddcc4ea6aa24a7ca6cd6ccde522b74398d7aef2d38af64da3ac213369473e9
+  data.tar.gz: 949bb44f979f5edaaf6aaa7035cc51ca93ccfed13ae9fb5d0fd010543e670d09f19fbadbb403a661d57e6e787bc25a036e5166bc4118fdd7354b43b24d840b41

data/app/controllers/dscf/marketplace/delivery_orders_controller.rb

@@ -120,6 +120,45 @@ module Dscf
         end
       end
 
+      def convert_orders
+        order_ids = params[:order_ids]
+        vehicle_type = params[:vehicle_type]
+        pickup_address_id = params[:pickup_address_id]
+        delivery_notes = params[:delivery_notes]
+
+        # Validate required parameters
+        unless order_ids.present? && vehicle_type.present? && pickup_address_id.present?
+          render_error("delivery_orders.errors.convert_orders_missing_params")
+          return
+        end
+
+        # Find orders and pickup address
+        orders = Dscf::Marketplace::Order.where(id: order_ids)
+        pickup_address = Dscf::Core::Address.find_by(id: pickup_address_id)
+
+        unless pickup_address
+          render_error("delivery_orders.errors.pickup_address_not_found")
+          return
+        end
+
+        # Check if all orders exist
+        if orders.count != order_ids.length
+          missing_ids = order_ids - orders.pluck(:id)
+          render_error("delivery_orders.errors.orders_not_found", message: "Orders not found: #{missing_ids.join(", ")}")
+          return
+        end
+
+        service = Dscf::Marketplace::DeliveryOrderService.new
+        begin
+          delivery_order = service.convert_orders_to_delivery(orders, vehicle_type, pickup_address, delivery_notes)
+          render_success("delivery_orders.success.orders_converted", data: delivery_order)
+        rescue Dscf::Marketplace::DeliveryOrderService::ConversionError => e
+          render_error("delivery_orders.errors.orders_conversion_failed", message: e.message)
+        rescue => e
+          render_error("delivery_orders.errors.convert_orders_failed", message: e.message)
+        end
+      end
+
       private
 
       def model_params

data/app/controllers/dscf/marketplace/orders_controller.rb

@@ -85,6 +85,10 @@ module Dscf
           update: [ :user, :ordered_by, :ordered_to, :quotation, :listing, :order_items ]
         }
       end
+
+      def find_record
+        Dscf::Marketplace::Order.find(params[:id])
+      end
     end
   end
 end

data/app/services/dscf/marketplace/delivery_order_service.rb

@@ -4,6 +4,8 @@ module Dscf::Marketplace
 
     class AssignmentError < StandardError; end
 
+    class ConversionError < StandardError; end
+
     def assign_driver(delivery_order, driver)
       raise ArgumentError, "Delivery order is required" unless delivery_order
       raise ArgumentError, "Driver is required" unless driver
@@ -21,5 +23,75 @@ module Dscf::Marketplace
 
       delivery_order
     end
+
+    def convert_orders_to_delivery(orders, vehicle_type, pickup_address, delivery_notes = nil)
+      raise ArgumentError, "Orders array is required" unless orders.present?
+      raise ArgumentError, "Vehicle type is required" unless vehicle_type.present?
+      raise ArgumentError, "Pickup address is required" unless pickup_address.present?
+
+      # Validate all orders can be converted
+      validate_orders_for_conversion(orders)
+
+      # Create delivery order in a transaction
+      DeliveryOrder.transaction do
+        delivery_order = create_delivery_order(vehicle_type, pickup_address, delivery_notes)
+        create_delivery_order_items(delivery_order, orders, pickup_address)
+        associate_orders_with_delivery(delivery_order, orders)
+
+        delivery_order
+      end
+    end
+
+    private
+
+    def validate_orders_for_conversion(orders)
+      orders.each do |order|
+        unless order.delivery?
+          raise ConversionError, "Order #{order.id} is not a delivery order"
+        end
+
+        unless order.confirmed? || order.processing?
+          raise ConversionError, "Order #{order.id} must be confirmed or processing to be converted"
+        end
+
+        if order.delivery_order.present?
+          raise ConversionError, "Order #{order.id} is already associated with a delivery order"
+        end
+      end
+    end
+
+    def create_delivery_order(vehicle_type, pickup_address, delivery_notes)
+      DeliveryOrder.create!(
+        vehicle_type: vehicle_type,
+        pickup_address: pickup_address,
+        delivery_notes: delivery_notes,
+        status: :draft
+      )
+    end
+
+    def create_delivery_order_items(delivery_order, orders, pickup_address)
+      orders.each do |order|
+        order.order_items.each do |order_item|
+          # For now, use the pickup address as both pickup and dropoff
+          # In a real implementation, you'd need to get the buyer's delivery address
+          dropoff_address = pickup_address # Temporary fallback
+
+          DeliveryOrderItem.create!(
+            delivery_order: delivery_order,
+            order_item: order_item,
+            quantity: order_item.quantity,
+            pickup_address: pickup_address,
+            dropoff_address: dropoff_address,
+            status: :pending
+          )
+        end
+      end
+    end
+
+    def associate_orders_with_delivery(delivery_order, orders)
+      orders.each do |order|
+        order.update!(delivery_order: delivery_order)
+      end
+    end
   end
 end

data/config/locales/en.yml

@@ -4,7 +4,7 @@
 # Pattern: {model_name}.{success|errors}.{action_name} - using plural for controller consistency
 
 en:
-  # Core Models
+# Core Models
   category:
     success:
       index: "Categories retrieved successfully"
@@ -234,28 +234,28 @@ en:
       update: "Failed to update order item"
       destroy: "Failed to delete order item"
 
-  # Delivery Models
+   # Delivery Models
   delivery_order:
-    success:
-      index: "Delivery orders retrieved successfully"
-      show: "Delivery order details retrieved successfully"
-      create: "Delivery order created successfully"
-      update: "Delivery order updated successfully"
-      destroy: "Delivery order deleted successfully"
-      pickup: "Delivery order picked up successfully"
-      start_delivery: "Delivery started successfully"
-      complete_delivery: "Delivery completed successfully"
-      mark_failed: "Delivery marked as failed"
-    errors:
-      index: "Failed to retrieve delivery orders"
-      show: "Failed to retrieve delivery order details"
-      create: "Failed to create delivery order"
-      update: "Failed to update delivery order"
-      destroy: "Failed to delete delivery order"
-      pickup: "Failed to pickup delivery order"
-      start_delivery: "Failed to start delivery"
-      complete_delivery: "Failed to complete delivery"
-      mark_failed: "Failed to mark delivery as failed"
+     success:
+     index: "Delivery orders retrieved successfully"
+     show: "Delivery order details retrieved successfully"
+     create: "Delivery order created successfully"
+     update: "Delivery order updated successfully"
+     destroy: "Delivery order deleted successfully"
+     pickup: "Delivery order picked up successfully"
+     start_delivery: "Delivery started successfully"
+     complete_delivery: "Delivery completed successfully"
+     mark_failed: "Delivery marked as failed"
+     errors:
+     index: "Failed to retrieve delivery orders"
+     show: "Failed to retrieve delivery order details"
+     create: "Failed to create delivery order"
+     update: "Failed to update delivery order"
+     destroy: "Failed to delete delivery order"
+     pickup: "Failed to pickup delivery order"
+     start_delivery: "Failed to start delivery"
+     complete_delivery: "Failed to complete delivery"
+     mark_failed: "Failed to mark delivery as failed"
 
   delivery_orders:
     success:
@@ -268,21 +268,26 @@ en:
       delivery_started: "Delivery started successfully"
       delivery_completed: "Delivery completed successfully"
       marked_failed: "Delivery marked as failed"
-      index.success: "Delivery orders retrieved successfully"
+      orders_converted: "Orders converted to delivery successfully"
     errors:
-       index: "Failed to retrieve delivery orders"
-       show: "Failed to retrieve delivery order details"
-       create: "Failed to create delivery order"
-       update: "Failed to update delivery order"
-       destroy: "Failed to delete delivery order"
-       picked_up: "Failed to pickup delivery order"
-       delivery_started: "Failed to start delivery"
-       delivery_completed: "Failed to complete delivery"
-       marked_failed: "Failed to mark delivery as failed"
-       pickup_failed: "Failed to pickup delivery order"
-       start_delivery_failed: "Failed to start delivery"
-       complete_delivery_failed: "Failed to complete delivery"
-       mark_failed_failed: "Failed to mark delivery as failed"
+      index: "Failed to retrieve delivery orders"
+      show: "Failed to retrieve delivery order details"
+      create: "Failed to create delivery order"
+      update: "Failed to update delivery order"
+      destroy: "Failed to delete delivery order"
+      picked_up: "Failed to pickup delivery order"
+      delivery_started: "Failed to start delivery"
+      delivery_completed: "Failed to complete delivery"
+      marked_failed: "Failed to mark delivery as failed"
+      pickup_failed: "Failed to pickup delivery order"
+      start_delivery_failed: "Failed to start delivery"
+      complete_delivery_failed: "Failed to complete delivery"
+      mark_failed_failed: "Failed to mark delivery as failed"
+      convert_orders_missing_params: "Missing required parameters: order_ids, vehicle_type, and pickup_address_id"
+      pickup_address_not_found: "Pickup address not found"
+      orders_not_found: "Some orders were not found"
+      orders_conversion_failed: "Failed to convert orders to delivery"
+      convert_orders_failed: "Unexpected error during order conversion"
 
   delivery_order_item:
     success:

data/config/routes.rb

@@ -106,6 +106,7 @@ Dscf::Marketplace::Engine.routes.draw do
     end
     collection do
       get "filter"
+      post "convert_orders"
     end
   end
 

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.3.4".freeze
+    VERSION = "0.3.6".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Asrat