|
|
|
@@ -4,6 +4,7 @@ namespace App\Repositories\Custom\HelloTechno; |
|
|
|
|
|
|
|
use App\Models\ReceiptIssuingHTParkingCustomOrder as CustomOrder; |
|
|
|
use App\Models\ReceiptIssuingOrder; |
|
|
|
use App\Models\ReceiptIssuingOrderTax; |
|
|
|
use App\Models\User; |
|
|
|
use App\Repositories\BaseRepository; |
|
|
|
use Illuminate\Database\Query\JoinClause; |
|
|
|
@@ -40,6 +41,7 @@ class ReceiptIssuingOrderRepository extends BaseRepository |
|
|
|
const TABLE_ORDER = "order"; |
|
|
|
const TABLE_CUSTOM_ORDER = "custom_order"; |
|
|
|
const TABLE_HANDLER = "handler"; |
|
|
|
const TABLE_TAX = "tax"; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
@@ -65,6 +67,12 @@ class ReceiptIssuingOrderRepository extends BaseRepository |
|
|
|
$this->makeColumnName([static::TABLE_ORDER, ReceiptIssuingOrder::COL_NAME_HANDLER_ID]), |
|
|
|
$this->makeColumnName([static::TABLE_HANDLER, CustomOrder::COL_NAME_ID]) |
|
|
|
); |
|
|
|
}) |
|
|
|
->leftJoinSub(ReceiptIssuingOrderTax::getBuilder(), static::TABLE_TAX, function (JoinClause $join) { |
|
|
|
$join->on( |
|
|
|
$this->makeColumnName([static::TABLE_ORDER, ReceiptIssuingOrder::COL_NAME_ID]), |
|
|
|
$this->makeColumnName([static::TABLE_TAX, ReceiptIssuingOrderTax::COL_NAME_RECEIPT_ISSUING_ORDER_ID]) |
|
|
|
); |
|
|
|
}); |
|
|
|
|
|
|
|
// -----検索条件 |
|
|
|
@@ -150,6 +158,7 @@ class ReceiptIssuingOrderRepository extends BaseRepository |
|
|
|
$order = static::TABLE_ORDER; |
|
|
|
$custom = static::TABLE_CUSTOM_ORDER; |
|
|
|
$handler = static::TABLE_HANDLER; |
|
|
|
$tax = static::TABLE_TAX; |
|
|
|
$columns = [ |
|
|
|
$this->makeColumnNameForSelect([$order, ReceiptIssuingOrder::COL_NAME_ID], 'id'), |
|
|
|
$this->makeColumnNameForSelect([$order, ReceiptIssuingOrder::COL_NAME_STATUS_NAME], 'status_name'), |
|
|
|
@@ -194,7 +203,8 @@ class ReceiptIssuingOrderRepository extends BaseRepository |
|
|
|
$this->makeColumnNameForSelect([$custom, CustomOrder::COL_NAME_ADJUST_SEQ_NO]), |
|
|
|
$this->makeColumnNameForSelect([$handler, User::COL_NAME_ID], 'handler_id'), |
|
|
|
$this->makeColumnNameForSelect([$handler, User::COL_NAME_NAME], 'handler_name'), |
|
|
|
|
|
|
|
$this->makeColumnNameForSelect([$tax, ReceiptIssuingOrderTax::COL_NAME_TAX_RATE]), |
|
|
|
$this->makeColumnNameForSelect([$tax, ReceiptIssuingOrderTax::COL_NAME_TAX_AMOUNT]), |
|
|
|
]; |
|
|
|
|
|
|
|
|
|
|
|
|