(fix) Billing response

api/src/main/java/org/openmrs/module/billing/advice/GenerateBillFromOrderAdvice.java

@@ -25,7 +25,6 @@
 import org.openmrs.module.billing.api.model.CashierItemPrice;
 import org.openmrs.module.billing.api.search.BillableServiceSearch;
 import org.openmrs.module.billing.exemptions.BillingExemptions;
-import org.openmrs.module.billing.util.Utils;
 import org.openmrs.module.stockmanagement.api.StockManagementService;
 import org.openmrs.module.stockmanagement.api.model.StockItem;
 import org.springframework.aop.AfterReturningAdvice;
@@ -44,6 +43,8 @@
 
 	private static final Log LOG = LogFactory.getLog(GenerateBillFromOrderAdvice.class);
 
+	private static final String DISABLE_DRUG_ORDER_BILL_AUTO_CREATION = "billing.disableDrugOrderBillAutoCreation";
+
 	OrderService orderService = Context.getOrderService();
 
 	IBillService billService = Context.getService(IBillService.class);
@@ -58,7 +59,7 @@
 	 * This is called immediately an order is saved
 	 */
 	@Override
 	public void afterReturning(Object returnValue, Method method, Object[] args, Object target) throws Throwable {
 		try {
 			ProgramWorkflowService workflowService = Context.getProgramWorkflowService();
 			if (method.getName().equals("saveOrder") && args.length > 0 && args[0] instanceof Order) {
@@ -75,6 +76,12 @@
 				String cashierUUID = Context.getAuthenticatedUser().getUuid();
 
 				if (order instanceof DrugOrder) {
+					// Check if drug order bill autocreation is disabled
+					boolean disableAutoBillCreation = Boolean.parseBoolean(
+					    Context.getAdministrationService().getGlobalProperty(DISABLE_DRUG_ORDER_BILL_AUTO_CREATION));
+					if (disableAutoBillCreation) {
+						return; // Skip drug order bill processing
+					}
 					DrugOrder drugOrder = (DrugOrder) order;
 					Integer drugID = drugOrder.getDrug() != null ? drugOrder.getDrug().getDrugId() : 0;
 					double drugQuantity = drugOrder.getQuantity() != null ? drugOrder.getQuantity() : 0.0;
@@ -117,7 +124,7 @@
 	 * @param config
 	 * @return
 	 */
 	private boolean checkIfOrderIsExempted(ProgramWorkflowService workflowService, Order order,
 	        Map<String, Set<Integer>> config) {
 		if (config == null || order == null || config.size() == 0) {
 			return false;
@@ -128,7 +135,7 @@
 		// check in programs list
 		List<String> programExemptions = config.keySet().stream().filter(key -> key.startsWith("program:"))
 		        .collect(Collectors.toList());
 		if (programExemptions.size() > 0) {
 			List<PatientProgram> programs = workflowService.getPatientPrograms(order.getPatient(), null, null, null,
 			    new Date(), null, false);
 			Set<String> activeEnrollments = new HashSet<>();
@@ -144,7 +151,7 @@
 					//check if patient is active in the program
 					if (activeEnrollments.contains(programName)) {
 						// check if order is exempted
 						if (config.get(programEntry).contains(order.getConcept().getConceptId())) {
 							return true;
 						}
 
@@ -154,7 +161,7 @@
 		}
 
 		// check age category
 		if (order.getPatient().getAge() < 5 && config.get("age<5") != null
 		        && config.get("age<5").contains(order.getConcept().getConceptId())) {
 			return true;
 		}
@@ -185,14 +192,14 @@
 			}
 
 			if (!itemPrices.isEmpty()) {
 				//List<CashierItemPrice> matchingPrices = itemPrices.stream().filter(p -> p.getPaymentMode().getUuid().equals(fetchPatientPayment(order))).collect(Collectors.toList());
 				// billLineItem.setPrice(matchingPrices.isEmpty() ? itemPrices.get(0).getPrice() : matchingPrices.get(0).getPrice());
 				billLineItem.setPrice(itemPrices.get(0).getPrice());
 			} else {
 				if (stockitem != null && stockitem.getPurchasePrice() != null) {
 					billLineItem.setPrice(stockitem.getPurchasePrice());
 				} else {
 					billLineItem.setPrice(new BigDecimal(0.0));
 				}
 			}
 			billLineItem.setQuantity(quantity);

api/src/main/java/org/openmrs/module/billing/advice/OrderCreationMethodBeforeAdvice.java

@@ -44,7 +44,6 @@
 import org.openmrs.module.billing.api.model.CashPoint;
 import org.openmrs.module.billing.api.model.CashierItemPrice;
 import org.openmrs.module.billing.api.search.BillableServiceSearch;
-import org.openmrs.module.billing.util.Utils;
 import org.openmrs.module.stockmanagement.api.StockManagementService;
 import org.openmrs.module.stockmanagement.api.model.StockItem;
 import org.springframework.aop.MethodBeforeAdvice;
@@ -53,6 +52,8 @@
 
 	private static final Log LOG = LogFactory.getLog(OrderCreationMethodBeforeAdvice.class);
 
+	private static final String DISABLE_DRUG_ORDER_BILL_AUTO_CREATION = "billing.disableDrugOrderBillAutoCreation";
+
 	OrderService orderService = Context.getOrderService();
 
 	IBillService billService = Context.getService(IBillService.class);
@@ -64,7 +65,7 @@
 	ICashPointService cashPointService = Context.getService(ICashPointService.class);
 
 	@Override
 	public void before(Method method, Object[] args, Object target) throws Throwable {
 		try {
 			// Extract the Order object from the arguments
 			if (method.getName().equals("saveOrder") && args.length > 0 && args[0] instanceof Order) {
@@ -79,6 +80,12 @@
 					Patient patient = order.getPatient();
 					String cashierUUID = Context.getAuthenticatedUser().getUuid();
 					if (order instanceof DrugOrder) {
+						// Check if drug order bill autocreation is disabled
+						boolean disableAutoBillCreation = Boolean.parseBoolean(
+						    Context.getAdministrationService().getGlobalProperty(DISABLE_DRUG_ORDER_BILL_AUTO_CREATION));
+						if (disableAutoBillCreation) {
+							return; // Skip drug order bill processing
+						}
 						DrugOrder drugOrder = (DrugOrder) order;
 						Integer drugID = drugOrder.getDrug() != null ? drugOrder.getDrug().getDrugId() : 0;
 						double drugQuantity = drugOrder.getQuantity() != null ? drugOrder.getQuantity() : 0.0;
@@ -106,7 +113,7 @@
 		}
 		catch (Exception e) {
 			LOG.error(e);
 			e.printStackTrace();
 		}
 	}
 
@@ -164,7 +171,7 @@
 		}
 		catch (Exception ex) {
 			LOG.error(ex);
 			ex.printStackTrace();
 		}
 	}
 

api/src/main/java/org/openmrs/module/billing/api/IBillService.java

@@ -107,6 +107,17 @@ public interface IBillService extends IEntityDataService<Bill> {
 	@Authorized(PrivilegeConstants.VIEW_BILLS)
 	Bill getByUuid(String uuid);
 
+	/**
+	 * Gets a bill by UUID, optionally including voided line items.
+	 *
+	 * @param uuid The bill UUID.
+	 * @param includeVoidedLineItems {@code true} to include voided line items, {@code false} to exclude
+	 *            them.
+	 * @return The bill with the specified UUID.
+	 */
+	@Authorized({ PrivilegeConstants.VIEW_BILLS })
+	Bill getByUuid(String uuid, boolean includeVoidedLineItems);
+
 	/**
 	 * Gets bill receipt using the specified {@link Bill} settings.
 	 *

api/src/main/java/org/openmrs/module/billing/api/IBillableItemsService.java

@@ -15,13 +15,13 @@
 
 import java.util.List;
 
-import org.openmrs.module.billing.api.base.entity.IEntityDataService;
+import org.openmrs.module.billing.api.base.entity.IMetadataDataService;
 import org.openmrs.module.billing.api.model.BillableService;
 import org.openmrs.module.billing.api.search.BillableServiceSearch;
 import org.springframework.transaction.annotation.Transactional;
 
 @Transactional
-public interface IBillableItemsService extends IEntityDataService<BillableService> {
+public interface IBillableItemsService extends IMetadataDataService<BillableService> {
 
 	List<BillableService> findServices(final BillableServiceSearch search);
 }

api/src/main/java/org/openmrs/module/billing/api/ICashierItemPriceService.java

@@ -13,9 +13,9 @@
  */
 package org.openmrs.module.billing.api;
 
-import org.openmrs.module.billing.api.base.entity.IEntityDataService;
+import org.openmrs.module.billing.api.base.entity.IMetadataDataService;
 import org.openmrs.module.billing.api.model.CashierItemPrice;
 import org.springframework.transaction.annotation.Transactional;
 
 @Transactional
-public interface ICashierItemPriceService extends IEntityDataService<CashierItemPrice> {}
+public interface ICashierItemPriceService extends IMetadataDataService<CashierItemPrice> {}

api/src/main/java/org/openmrs/module/billing/api/ItemPriceService.java

@@ -15,14 +15,14 @@
 
 import java.util.List;
 
-import org.openmrs.module.billing.api.base.entity.IEntityDataService;
+import org.openmrs.module.billing.api.base.entity.IMetadataDataService;
 import org.openmrs.module.billing.api.model.BillableService;
 import org.openmrs.module.billing.api.model.CashierItemPrice;
 import org.openmrs.module.stockmanagement.api.model.StockItem;
 import org.springframework.transaction.annotation.Transactional;
 
 @Transactional
-public interface ItemPriceService extends IEntityDataService<CashierItemPrice> {
+public interface ItemPriceService extends IMetadataDataService<CashierItemPrice> {
 
 	CashierItemPrice save(CashierItemPrice price);
 

api/src/main/java/org/openmrs/module/billing/api/impl/BillLineItemServiceImpl.java

@@ -13,9 +13,12 @@
  */
 package org.openmrs.module.billing.api.impl;
 
+import org.openmrs.api.context.Context;
 import org.openmrs.module.billing.api.BillLineItemService;
+import org.openmrs.module.billing.api.IBillService;
 import org.openmrs.module.billing.api.base.entity.impl.BaseEntityDataServiceImpl;
 import org.openmrs.module.billing.api.base.entity.security.IEntityAuthorizationPrivileges;
+import org.openmrs.module.billing.api.model.Bill;
 import org.openmrs.module.billing.api.model.BillLineItem;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -29,7 +32,7 @@ protected IEntityAuthorizationPrivileges getPrivileges() {
 
 	@Override
 	protected void validate(BillLineItem object) {
-
+		// Status checks removed to allow bill modification regardless of status
 	}
 
 	@Override
@@ -51,4 +54,47 @@ public String getPurgePrivilege() {
 	public String getGetPrivilege() {
 		return null;
 	}
+
+	@Override
+	public BillLineItem voidEntity(BillLineItem entity, String reason) {
+		BillLineItem voidedLineItem = super.voidEntity(entity, reason);
+
+		if (voidedLineItem != null && voidedLineItem.getBill() != null) {
+			Bill bill = voidedLineItem.getBill();
+			bill.synchronizeBillStatus();
+		}
+
+		return voidedLineItem;
+	}
+
+	@Override
+	public BillLineItem unvoidEntity(BillLineItem entity) {
+		BillLineItem unvoidedLineItem = super.unvoidEntity(entity);
+
+		if (unvoidedLineItem != null && unvoidedLineItem.getBill() != null) {
+			Bill bill = unvoidedLineItem.getBill();
+			bill.synchronizeBillStatus();
+		}
+
+		return unvoidedLineItem;
+	}
+
+	@Override
+	public void purge(BillLineItem entity) {
+		Bill bill = null;
+		if (entity != null && entity.getBill() != null) {
+			bill = entity.getBill();
+		}
+
+		super.purge(entity);
+
+		if (bill != null) {
+			// Remove the line item from the bill's collection
+			bill.removeLineItem(entity);
+			bill.synchronizeBillStatus();
+			// Save the bill to persist the collection change
+			IBillService billService = Context.getService(IBillService.class);
+			billService.save(bill);
+		}
+	}
 }