diff --git a/app/Classes/Modules/Questionnaires/ControllersLogic/FetchAdminWFBookingLogic.php b/app/Classes/Modules/Questionnaires/ControllersLogic/FetchAdminWFBookingLogic.php index 855c770c..5b0b1cd1 100644 --- a/app/Classes/Modules/Questionnaires/ControllersLogic/FetchAdminWFBookingLogic.php +++ b/app/Classes/Modules/Questionnaires/ControllersLogic/FetchAdminWFBookingLogic.php @@ -7,7 +7,7 @@ use App\Classes\General\Abstracts\AbstractControllerLogic; use App\Classes\Modules\Questionnaires\Standards\Rules\CanFetchQuestion; use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\Modules\Bookings\Services\FetchesBooking; -use App\Http\Resources\BookingResource; +use App\Http\Resources\BookingBaseResource; use App\Models\Booking; use App\Models\KeyValuePair; use Carbon\Carbon; @@ -106,6 +106,6 @@ class FetchAdminWFBookingLogic extends AbstractControllerLogic // 'booking' => new BookingBaseResource($booking) // ]); - return $this->resourceResponse(new BookingResource($booking)); + return $this->resourceResponse(new BookingBaseResource($booking)); } } diff --git a/app/Classes/Modules/Questionnaires/ControllersLogic/FetchAdminWFModelAttributesLogic.php b/app/Classes/Modules/Questionnaires/ControllersLogic/FetchAdminWFModelAttributesLogic.php index 6727fde9..ed7151e0 100644 --- a/app/Classes/Modules/Questionnaires/ControllersLogic/FetchAdminWFModelAttributesLogic.php +++ b/app/Classes/Modules/Questionnaires/ControllersLogic/FetchAdminWFModelAttributesLogic.php @@ -76,7 +76,7 @@ class FetchAdminWFModelAttributesLogic extends AbstractControllerLogic // 'total_amount' =>$transaction->currency->short_code . ' ' . number_format((float)$transaction->amount, 2, '.', '') // ]); - return $this->resourceResponse(new BookingResource($booking)); + return $this->resourceResponse(new BookingBaseResource($booking)); } } diff --git a/app/Classes/Modules/Questionnaires/ControllersLogic/FetchAdminWFPendingApprovalPOLogic.php b/app/Classes/Modules/Questionnaires/ControllersLogic/FetchAdminWFPendingApprovalPOLogic.php index 54cb6a99..7006bdc0 100644 --- a/app/Classes/Modules/Questionnaires/ControllersLogic/FetchAdminWFPendingApprovalPOLogic.php +++ b/app/Classes/Modules/Questionnaires/ControllersLogic/FetchAdminWFPendingApprovalPOLogic.php @@ -93,7 +93,7 @@ class FetchAdminWFPendingApprovalPOLogic extends AbstractControllerLogic // ]); // return $booking ? responseJson(new BookingBaseResource($booking)) : responseJson(null, 'No booking found', 404); - return $this->resourceResponse(new BookingResource($booking)); + return $this->resourceResponse(new BookingBaseResource($booking)); } } diff --git a/app/Classes/Modules/Questionnaires/ControllersLogic/FetchAdminWFPendingFillPOLogic.php b/app/Classes/Modules/Questionnaires/ControllersLogic/FetchAdminWFPendingFillPOLogic.php index 29423c50..001838ce 100644 --- a/app/Classes/Modules/Questionnaires/ControllersLogic/FetchAdminWFPendingFillPOLogic.php +++ b/app/Classes/Modules/Questionnaires/ControllersLogic/FetchAdminWFPendingFillPOLogic.php @@ -8,7 +8,7 @@ use App\Classes\Modules\Questionnaires\Standards\Rules\CanFetchQuestion; use App\Classes\Modules\Bookings\Services\FetchesBooking; use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\ValueObjects\Constants\TransactionType; -use App\Http\Resources\BookingResource; +use App\Http\Resources\BookingBaseResource; use App\Models\KeyValuePair; use Carbon\Carbon; use App\Models\Booking; @@ -90,7 +90,7 @@ class FetchAdminWFPendingFillPOLogic extends AbstractControllerLogic // ]); // return $booking ? responseJson(new BookingResource($booking)) : responseJson(null, 'No booking found', 404); - return $this->resourceResponse(new BookingResource($booking)); + return $this->resourceResponse(new BookingBaseResource($booking)); } } diff --git a/app/Classes/Modules/Questionnaires/ControllersLogic/UpdateNextQuestionV1AdminWFLogic.php b/app/Classes/Modules/Questionnaires/ControllersLogic/UpdateNextQuestionV1AdminWFLogic.php index 225e33e6..b59d7ff8 100644 --- a/app/Classes/Modules/Questionnaires/ControllersLogic/UpdateNextQuestionV1AdminWFLogic.php +++ b/app/Classes/Modules/Questionnaires/ControllersLogic/UpdateNextQuestionV1AdminWFLogic.php @@ -8,6 +8,8 @@ use App\Classes\Modules\Questionnaires\Standards\Rules\CanFetchQuestion; use App\Classes\Modules\Questionnaires\Processors\SaveAnswerV1AdminWFProcessor; use App\Classes\Modules\Questionnaires\Processors\FetchNextQuestionV1AdminWFProcessor; use App\Classes\Modules\Questionnaires\Processors\FetchFirstQuestionV1AdminWFProcessor; +use App\Classes\Modules\Questionnaires\Processors\SaveAnswerActionV1AdminWFProcessor; +use App\Classes\Modules\Questionnaires\Processors\FetchNextQuestionMetadataV1AdminWFProcessor; use App\Classes\Modules\Questionnaires\Services\ListsQuestionUserAnswerSelected; use App\Classes\Modules\Accounts\Services\CreatesKeyValuePair; use App\Classes\Modules\Accounts\DataTransferObjects\KeyValuePairObject; @@ -37,9 +39,15 @@ class UpdateNextQuestionV1AdminWFLogic extends AbstractControllerLogic /** @var SaveAnswerV1AdminWFProcessor */ private $saveAnswerProcessor; + /** @var SaveAnswerActionV1AdminWFProcessor */ + private $saveAnswerActionProcessor; + /** @var FetchNextQuestionV1AdminWFProcessor */ private $fetchNextQuestionQAProcessor; + /** @var FetchNextQuestionMetadataV1AdminWFProcessor */ + private $fetchNextQuestionMetadataProcessor; + /** @var FetchFirstQuestionV1AdminWFProcessor */ private $fetchFirstQuestionQAProcessor; @@ -57,8 +65,10 @@ class UpdateNextQuestionV1AdminWFLogic extends AbstractControllerLogic * @param FetchFirstQuestionV1AdminWFProcessor $fetchFirstQuestionQAProcessor * @param ListsQuestionUserAnswerSelected $listsUserAnswerSelected * @param CreatesKeyValuePair $createsKeyValuePair + * @param SaveAnswerActionV1AdminWFProcessor $saveAnswerActionProcessor + * @param FetchNextQuestionMetadataV1AdminWFProcessor $fetchNextQuestionMetadataProcessor */ - public function __construct(CanFetchQuestion $canFetchQuestion, SaveAnswerV1AdminWFProcessor $saveAnswerProcessor, FetchNextQuestionV1AdminWFProcessor $fetchNextQuestionQAProcessor, FetchFirstQuestionV1AdminWFProcessor $fetchFirstQuestionQAProcessor, ListsQuestionUserAnswerSelected $listsUserAnswerSelected, CreatesKeyValuePair $createsKeyValuePair) + public function __construct(CanFetchQuestion $canFetchQuestion, SaveAnswerV1AdminWFProcessor $saveAnswerProcessor, FetchNextQuestionV1AdminWFProcessor $fetchNextQuestionQAProcessor, FetchFirstQuestionV1AdminWFProcessor $fetchFirstQuestionQAProcessor, ListsQuestionUserAnswerSelected $listsUserAnswerSelected, CreatesKeyValuePair $createsKeyValuePair, SaveAnswerActionV1AdminWFProcessor $saveAnswerActionProcessor, FetchNextQuestionMetadataV1AdminWFProcessor $fetchNextQuestionMetadataProcessor) { $this->canFetchQuestion = $canFetchQuestion; $this->saveAnswerProcessor = $saveAnswerProcessor; @@ -66,6 +76,8 @@ class UpdateNextQuestionV1AdminWFLogic extends AbstractControllerLogic $this->fetchFirstQuestionQAProcessor = $fetchFirstQuestionQAProcessor; $this->listsUserAnswerSelected = $listsUserAnswerSelected; $this->createsKeyValuePair = $createsKeyValuePair; + $this->saveAnswerActionProcessor = $saveAnswerActionProcessor; + $this->fetchNextQuestionMetadataProcessor = $fetchNextQuestionMetadataProcessor; } @@ -77,12 +89,8 @@ class UpdateNextQuestionV1AdminWFLogic extends AbstractControllerLogic */ public function logic(Request $request) : JsonResponse { - $questionId = 0; $userId = Auth::user()->id; $currentQuestion = $request->question; - $questionId = $currentQuestion['id']; - $questionType = $currentQuestion['question_type']; - $currentQuestionNumber = $currentQuestion['question_number']; $answerNextQuestionNumber = null; $answerValue = null; $timeUsedSeconds = 0; @@ -116,7 +124,8 @@ class UpdateNextQuestionV1AdminWFLogic extends AbstractControllerLogic if ($request->has('isPrevious')){ $answerInText = "go_back"; } - $answer = $this->saveAnswerProcessor->execute($userId, 0, $questionId, $questionType, $questionMetadata, $answerInText, $answerOptionId, $filesUpload, $timeUsedSeconds, $request->has('isPrevious'), $reference); + $answer = $this->saveAnswerProcessor->execute($userId, 0, $currentQuestion['id'], $currentQuestion['question_type'], $questionMetadata, $answerInText, $answerOptionId, $filesUpload, $timeUsedSeconds, $request->has('isPrevious'), $reference); + $this->saveAnswerActionProcessor->execute($questionMetadata, $answerOptionId); //Marked data that has already been processed so that it does not appear again $isNoGoingBack = null; @@ -160,7 +169,7 @@ class UpdateNextQuestionV1AdminWFLogic extends AbstractControllerLogic } //Get returned question (previous or next) - $returnQuestion = $this->fetchNextQuestionQAProcessor->execute($request, $previousAnswer); + $returnQuestion = $this->fetchNextQuestionQAProcessor->execute($request, $previousAnswer); if($returnQuestion && $returnQuestion->is_start){ $isNoGoingBack = 1; @@ -169,6 +178,8 @@ class UpdateNextQuestionV1AdminWFLogic extends AbstractControllerLogic $isNoGoingBack = 0; } + $returnQuestion = $this->fetchNextQuestionMetadataProcessor->execute($returnQuestion, $questionMetadata); + //When a questionnaire ended, return back the first question if(is_null($returnQuestion)){ $returnQuestion = $this->fetchFirstQuestionQAProcessor->execute($request); @@ -176,4 +187,4 @@ class UpdateNextQuestionV1AdminWFLogic extends AbstractControllerLogic return $this->resourceResponse(new QuestionResource($returnQuestion, $userId, $request->has('isPrevious'), $isNoGoingBack, $previousAnswer)); } -} +} \ No newline at end of file diff --git a/app/Classes/Modules/Questionnaires/Processors/FetchNextQuestionMetadataV1AdminWFProcessor.php b/app/Classes/Modules/Questionnaires/Processors/FetchNextQuestionMetadataV1AdminWFProcessor.php new file mode 100644 index 00000000..95d975b6 --- /dev/null +++ b/app/Classes/Modules/Questionnaires/Processors/FetchNextQuestionMetadataV1AdminWFProcessor.php @@ -0,0 +1,15 @@ +question_number === '1688_order_verification'){ + $returnQuestion->question_description = $questionMetadata['amount_processed'] ." ".$questionMetadata['fixed_currency']['short_code'] . "/" . $questionMetadata['amount'] ." ".$questionMetadata['fixed_currency']['short_code']; + } + + return $returnQuestion; + } +} diff --git a/app/Classes/Modules/Questionnaires/Processors/FetchNextQuestionV1AdminWFProcessor.php b/app/Classes/Modules/Questionnaires/Processors/FetchNextQuestionV1AdminWFProcessor.php index 5a87eb34..98d91a9b 100644 --- a/app/Classes/Modules/Questionnaires/Processors/FetchNextQuestionV1AdminWFProcessor.php +++ b/app/Classes/Modules/Questionnaires/Processors/FetchNextQuestionV1AdminWFProcessor.php @@ -4,29 +4,37 @@ namespace App\Classes\Modules\Questionnaires\Processors; use App\Classes\Modules\Questionnaires\Services\FetchesQuestion; +use App\Classes\Modules\Questionnaires\Services\ListsQuestions; use Illuminate\Http\Request; use App\Classes\ValueObjects\Constants\QAType; +use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\Log; class FetchNextQuestionV1AdminWFProcessor { /** @var FetchesQuestion */ private $fetchesQuestion; + /** @var ListsQuestions */ + private $listsQuestions; + /** * FetchNextQuestionV1AdminWFProcessor constructor. * @param FetchesQuestion $fetchesQuestion + * @param ListsQuestions $listsQuestions */ - public function __construct(FetchesQuestion $fetchesQuestion) + public function __construct(FetchesQuestion $fetchesQuestion, ListsQuestions $listsQuestions) { $this->fetchesQuestion = $fetchesQuestion; + $this->listsQuestions = $listsQuestions; } - public function execute(Request $request, $previousAnswer){ + public function execute(Request $request, $previousAnswer){ $isEnd = 0; $questionId = 0; - $nextQuestionNumber = 0; - $nextNestedQuestion = 0; - $nextMainQuestion= 0; + $nextQuestionNumber = ""; + $nextNestedQuestion = ""; + $nextMainQuestion= ""; $questionnaireSetId = 0; $currentQuestion = $request->question; $questionType = QAType::DEFAULT; @@ -54,6 +62,8 @@ class FetchNextQuestionV1AdminWFProcessor return null; } + Log::info("Previous Answer question id: ".$previousAnswer['question_id']); + //Get previous question $previousQuestion = $this->fetchesQuestion->execute(['questionnaire_set_id' => $questionnaireSetId, 'id' => $previousAnswer['question_id']]); $returnQuestion = $previousQuestion; @@ -61,22 +71,55 @@ class FetchNextQuestionV1AdminWFProcessor else{ //Get next question $nextQuestion = null; - $question_number = 0; - if($nextQuestionNumber !== 0){ + $question_number = ""; + if($nextQuestionNumber !== ""){ $question_number = $nextQuestionNumber; } - else if($nextNestedQuestion !== 0){ + else if($nextNestedQuestion !== ""){ $question_number = $nextNestedQuestion; } else { $question_number = $nextMainQuestion; } - if($question_number !== 0){ + if($question_number !== ""){ + //Check if question exists + $questions = $this->listsQuestions->execute(['questionnaire_set_id' => $questionnaireSetId, 'question_number' => $question_number]); + + if($previousAnswer['answer'] === '1688_underpaid_overpaid' && count($questions) == 0){ + $extra = $request->extra; + $questionMetadata = $extra['questionMetadata'] ?? null; + $processed = round((floatval($questionMetadata['amount_processed']) + PHP_FLOAT_EPSILON) * 1000) / 1000; + $amount = round((floatval($questionMetadata['amount']) + PHP_FLOAT_EPSILON) * 1000) / 1000; + + //1688_underpaid_order_1, 1688_underpaid_order_2,1688_overpaid_order + if ($processed === $amount) { + Log::info('The amounts are exactly the same:', [ + 'amount_processed' => $questionMetadata['amount_processed'], + 'amount' => $questionMetadata['amount'] + ]); + $question_number = '1688_underpaid_order_1'; + } elseif ($processed < $amount) { + Log::info('The processed amount is under the expected amount:', [ + 'amount_processed' => $questionMetadata['amount_processed'], + 'amount' => $questionMetadata['amount'] + ]); + $question_number = '1688_underpaid_order_2'; + } else { + Log::info('The processed amount is over the expected amount:', [ + 'amount_processed' => $questionMetadata['amount_processed'], + 'amount' => $questionMetadata['amount'] + ]); + $question_number = '1688_overpaid_order'; + } + } + $nextQuestion = $this->fetchesQuestion->execute(['questionnaire_set_id' => $questionnaireSetId, 'question_number' => $question_number]); $returnQuestion = $nextQuestion; } + //cief todo: 74 else if (array_key_exists('id', $request->input('question'))) { + dd('cbal todo'); $nextQuestion = $this->fetchesQuestion->execute(['questionnaire_set_id' => $questionnaireSetId, 'id_next' => $questionId, 'next_main_question' => null]); $returnQuestion = $nextQuestion; } @@ -84,4 +127,4 @@ class FetchNextQuestionV1AdminWFProcessor return $returnQuestion; } -} +} \ No newline at end of file diff --git a/app/Classes/Modules/Questionnaires/Processors/SaveAnswerV1AdminWFProcessor.php b/app/Classes/Modules/Questionnaires/Processors/SaveAnswerV1AdminWFProcessor.php index cd5e6bdc..64ff9be7 100644 --- a/app/Classes/Modules/Questionnaires/Processors/SaveAnswerV1AdminWFProcessor.php +++ b/app/Classes/Modules/Questionnaires/Processors/SaveAnswerV1AdminWFProcessor.php @@ -4,7 +4,6 @@ namespace App\Classes\Modules\Questionnaires\Processors; use App\Models\QAUserAnswerSelected; -use App\Classes\Modules\Questionnaires\Processors\SaveAnswerActionV1AdminWFProcessor; use App\Classes\Modules\Documents\Processors\UploadDocumentProcessor; use App\Classes\ValueObjects\Constants\QAType; @@ -13,18 +12,13 @@ class SaveAnswerV1AdminWFProcessor /** @var UploadDocumentProcessor */ private $uploadDocumentForProcessor; - /** @var SaveAnswerActionV1AdminWFProcessor */ - private $saveAnswerActionProcessor; - /** * SaveAnswerV1AdminWFProcessor constructor. * @param UploadDocumentProcessor $uploadDocumentForProcessor - * @param SaveAnswerActionV1AdminWFProcessor $saveAnswerActionProcessor */ - public function __construct(UploadDocumentProcessor $uploadDocumentForProcessor, SaveAnswerActionV1AdminWFProcessor $saveAnswerActionProcessor) + public function __construct(UploadDocumentProcessor $uploadDocumentForProcessor) { $this->uploadDocumentForProcessor = $uploadDocumentForProcessor; - $this->saveAnswerActionProcessor = $saveAnswerActionProcessor; } /** @@ -79,8 +73,6 @@ class SaveAnswerV1AdminWFProcessor } $answer->save(); - $this->saveAnswerActionProcessor->execute($questionMetadata, $answerOptionId); - return $answer; } } diff --git a/app/Classes/ValueObjects/Constants/QAType.php b/app/Classes/ValueObjects/Constants/QAType.php index 245c78ba..43f5b7c5 100644 --- a/app/Classes/ValueObjects/Constants/QAType.php +++ b/app/Classes/ValueObjects/Constants/QAType.php @@ -9,7 +9,7 @@ final class QAType { public const MULTIPLE_CHOICES = 1; - // public const FREE_TEXT = 2; + public const FREE_TEXT = 2; public const DOCUMENT_UPLOAD = 3; @@ -22,4 +22,6 @@ final class QAType { public const REMARKS_WITH_DOCUMENT_UPLOAD = 7; public const SUBMIT_1688_3_TYPES_DOCUMENTS = 8; + + public const FLOAT_MONEY = 9; } diff --git a/app/Http/Resources/BookingBaseResource.php b/app/Http/Resources/BookingBaseResource.php index 1490bf24..0e6d1939 100644 --- a/app/Http/Resources/BookingBaseResource.php +++ b/app/Http/Resources/BookingBaseResource.php @@ -2,8 +2,11 @@ namespace App\Http\Resources; - +use App\Classes\ValueObjects\Constants\ApprovalStatus; +use App\Classes\ValueObjects\Constants\TransactionType; +use App\Classes\ValueObjects\Constants\BookingAttributeNames; use Illuminate\Http\Resources\Json\JsonResource; +use Carbon\Carbon; class BookingBaseResource extends JsonResource { @@ -20,8 +23,32 @@ class BookingBaseResource extends JsonResource 'id' => $this->id, 'company' => new CompanyResource($this->company), 'bank' => new BankResource($this->bank), + 'service' => new ServiceTypeResource($this->service), 'marking' => $this->marking, + 'amount' => $this->fix_amount, 'fixed_currency' => new CurrencyResource($this->fixedCurrency), + 'order_reference_no' => $this->modelAttributes()->where('name', BookingAttributeNames::ORDER_REFERENCE_NO)->get()->map(function ($attr) { + return [ + 'id' => $attr->id, + 'value' => $attr->value + ]; + }), + 'status' => $this->status, + 'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'), + // 'created_at_with_time' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'), + $this->mergeWhen($this->relationLoaded('transactions'), [ + 'payment_history' => TransactionResource::collection($this->transactions()->where(function($query){ + $query->where(function($query){ + $query->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED, ApprovalStatus::REFUNDED]); + })->orWhere(function($query){ + $query->where(function($query){ + $query->where('type', TransactionType::REFUND)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::REJECTED, ApprovalStatus::COMPLETED]); + })->orWhere(function($query){ + $query->where('type', TransactionType::CREDIT_NOTE)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]); + }); + }); + })->latest()->get()) + ]) ]; } -} +} \ No newline at end of file diff --git a/database/seeds/QAWorkFlowSeeder.php b/database/seeds/QAWorkFlowSeeder.php index 03af104a..80404e1e 100644 --- a/database/seeds/QAWorkFlowSeeder.php +++ b/database/seeds/QAWorkFlowSeeder.php @@ -127,13 +127,14 @@ class QAWorkFlowSeeder extends Seeder 'question_title' => 'Order Amount', 'question_description' => 'Please key in the order amount', 'question_' => 'Order Amount', - 'question_type' => QAType::MULTIPLE_CHOICES, + 'question_type' => QAType::FLOAT_MONEY, + 'next_nested_question' => '1688_order_verification', //'url' => 'api.admin_work_flow.fetch_model_attributes', 'is_start' => false, 'is_end' => false, - 'answer_options' => [ - ['display_text' => 'Yes', 'value' => '1688_order_verification', 'next_question_number' => '1688_order_verification'], - ], + // 'answer_options' => [ + // ['display_text' => 'Yes', 'value' => '1688_order_verification', 'next_question_number' => '1688_order_verification'], + // ], 'group' => '1688', ], [ @@ -144,7 +145,7 @@ class QAWorkFlowSeeder extends Seeder 'is_end' => false, 'answer_options' => [ ['display_text' => 'Yes', 'value' => '1688_proceed_order', 'next_question_number' => '1688_proceed_order'], - ['display_text' => 'No', 'value' => '1688_insufficient_order', 'next_question_number' => '1688_insufficient_order'], + ['display_text' => 'No', 'value' => '1688_underpaid_overpaid', 'next_question_number' => '1688_underpaid_overpaid'], ], 'group' => '1688', ], @@ -376,9 +377,42 @@ class QAWorkFlowSeeder extends Seeder 'is_start' => false, 'is_end' => false, 'answer_options' => [ - ['display_text' => 'Underpaid Order', 'value' => 'underpaird_order_1', 'next_question_number' => ''], - ['display_text' => 'Underpaid Order', 'value' => 'underpaird_order_2', 'next_question_number' => ''], - ['display_text' => 'Overpaid Order', 'value' => 'underpaird_order_2', 'next_question_number' => ''], + ['display_text' => 'Underpaid Order', 'value' => 'underpaid_order_1', 'next_question_number' => '1688_issue_submit'], + ['display_text' => 'Underpaid Order', 'value' => 'underpaid_order_2', 'next_question_number' => '1688_issue_submit'], + ['display_text' => 'Overpaid Order', 'value' => 'underpaid_order_2', 'next_question_number' => '1688_issue_submit'], + ], + 'group' => '1688', + ], + [ + 'question_number' => '1688_underpaid_order_1', + 'question_title' => 'This order is underpaid 1', + 'question_type' => QAType::MULTIPLE_CHOICES, + 'is_start' => false, + 'is_end' => false, + 'answer_options' => [ + ['display_text' => 'Done', 'value' => '1688_issue_submit', 'next_question_number' => '1688_issue_submit'], + ], + 'group' => '1688', + ], + [ + 'question_number' => '1688_underpaid_order_2', + 'question_title' => 'This order is underpaid 2', + 'question_type' => QAType::MULTIPLE_CHOICES, + 'is_start' => false, + 'is_end' => false, + 'answer_options' => [ + ['display_text' => 'Done', 'value' => '1688_issue_submit', 'next_question_number' => '1688_issue_submit'], + ], + 'group' => '1688', + ], + [ + 'question_number' => '1688_overpaid_order', + 'question_title' => 'This order is overpaid', + 'question_type' => QAType::MULTIPLE_CHOICES, + 'is_start' => false, + 'is_end' => false, + 'answer_options' => [ + ['display_text' => 'Done', 'value' => '1688_issue_submit', 'next_question_number' => '1688_issue_submit'], ], 'group' => '1688', ], diff --git a/resources/assets/vue/components/general/forms/AdminWorkFlowFormComponent.vue b/resources/assets/vue/components/general/forms/AdminWorkFlowFormComponent.vue index da7a3d35..0d9e9bef 100644 --- a/resources/assets/vue/components/general/forms/AdminWorkFlowFormComponent.vue +++ b/resources/assets/vue/components/general/forms/AdminWorkFlowFormComponent.vue @@ -12,7 +12,7 @@ - +

{{questionTitle}}

@@ -119,24 +119,29 @@ {{ externalApiResponse.data.marking }} -
-
-

- ORDER Reference(s): -

-
-

- {{ index + 1 + '. #' + attribute.value }} -

-
-
-

- Total CNY: -

-
-
-
+
+ +
+
Total:
+
+ {{(Math.round(( parseFloat(externalApiResponse.data.amount_processed) + Number.EPSILON) * 1000) / 1000).toFixed(3)}}/ + {{(Math.round((externalApiResponse.data.amount + Number.EPSILON) * 1000) / 1000).toFixed(3)}} {{externalApiResponse.data.fixed_currency.short_code}} +
+ +
@@ -194,6 +199,18 @@
+
+
+
+
+
+ + +
+
+
+
+
@@ -259,7 +276,7 @@
-
+