cief/shipping-portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git synced 2026-08-19 04:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dillon/46-warehouse-storage-charges-2-merge-conflict

Browse Source
This commit is contained in:
Dillon Ngo
2023-12-11 21:29:06 +08:00
parent a7d4299897 782a5c33ad
commit e7279ec4d0
28 changed files with 758 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Exports/Services/ExportsFeedback.php
+8 -3
View File
@@ -20,9 +20,11 @@ class ExportsFeedback implements FromQuery, WithHeadings, WithHeadingRow, WithMa
public function headings(): array
{
return [
'Version',
'Question Set',
'Question Text',
'Answer',
'Answer Text',
'Answer Value',
'Source System',
'Source Marking',
'Source Email',
@@ -38,7 +40,7 @@ class ExportsFeedback implements FromQuery, WithHeadings, WithHeadingRow, WithMa
return QAUserAnswerSelected::whereHas('question', function ($query) {
$query->whereHas('questionnaire', function ($innerQuery) {
$innerQuery->where('group', 'feedback');
})->where('created_at', '>', Carbon::now()->subMonths(1));
}); //->where('created_at', '>', Carbon::now()->subMonths(1));
})->orderBy('created_at', 'desc');
}
@@ -56,11 +58,14 @@ class ExportsFeedback implements FromQuery, WithHeadings, WithHeadingRow, WithMa
$companyModule = $user->companyModule()->first();
$user_marking = $companyModule ? $companyModule->inviters()->withPivot('invitee_reference')->first()->pivot->invitee_reference : "";
}
$answer = $userAnswer->answer;
return [
$userAnswer->question->questionnaire->version,
$userAnswer->question->questionnaire->description,
$userAnswer->question->question_text,
$userAnswer->free_text_answer,
$answer->display_text,
$answer->value,
$user ? QASystemSourceType::getText(QASystemSourceType::IZYIM) : QASystemSourceType::getText($source->system),
$user ? $user_marking : $source->marking,
$user ? $user->email : $source->email,
app/Classes/Modules/HelpMenu/ControllersLogic/ListQuestionsQALogic.php
+1 -1
View File
@@ -59,7 +59,7 @@ class ListQuestionsQALogic extends AbstractControllerLogic
$delimiter = "|";
$parts = explode($delimiter, $decriptedToken);
$questionSet = $parts[3];
$query = $this->listsHelpMenuQuestions->execute(['questionnaire_set_id' => $questionSet]);
$query = $this->listsHelpMenuQuestions->execute(['questionnaire_set_id' => $questionSet, 'order_by' => (object)['column' => 'order','DESC' => false]]);
return $this->collectionResponse(HelpMenuQuestionResource::collection($query));
}
app/Classes/Modules/Orders/Processors/UpdateDoFromYDPortalProcessor.php
+1
View File
@@ -72,6 +72,7 @@ class UpdateDoFromYDPortalProcessor
} catch (\Exception $exception){
log::debug($exception);
throw new InternalServerErrorException('failed to approve address due to an error related to YD portal');
}
}
app/Classes/Modules/Transactions/ControllersLogic/RegenerateSingleShippingInvoiceTransactionLogic.php
+76
View File
@@ -0,0 +1,76 @@
<?php
namespace App\Classes\Modules\Transactions\ControllersLogic;
use App\Classes\General\Abstracts\AbstractControllerLogic;
use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
use App\Classes\ValueObjects\Constants\ApprovalStatus;
use App\Classes\ValueObjects\Constants\DocumentType;
use App\Classes\ValueObjects\Constants\TransactionType;
use App\Models\Order;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
use App\Classes\Modules\Documents\Services\CreatesDocument;
use App\Classes\Modules\Documents\Services\CreatesFiles;
use App\Classes\Modules\Transactions\Services\FetchesTransaction;
use App\Models\Document;
class RegenerateSingleShippingInvoiceTransactionLogic extends AbstractControllerLogic
{
/**
* @return array
*/
protected function notification():array {
return [
'title' => 'Regenerate Shipping Invoice',
'message' => 'You have successfully regenerated shipping invoice'
];
}
/** @var CreatesDocument */
private $createsDocument;
/** @var CreatesFiles */
private $createsFiles;
/** @var FetchesTransaction */
private $fetchesTransaction;
/**
* @param CreatesDocument $createsDocument
*/
public function __construct(CreatesDocument $createsDocument, CreatesFiles $createsFiles, FetchesTransaction $fetchesTransaction)
{
$this->createsDocument = $createsDocument;
$this->createsFiles = $createsFiles;
$this->fetchesTransaction = $fetchesTransaction;
}
public function logic(Request $request) : JsonResponse
{
$invoice = $this->fetchesTransaction->execute(['id' => $request->route('invoice_id')]);
$invoice->documents()->delete();
$transaction_invoice_pdf = LaravelMpdf::loadView('pages.pdfs.shipping_invoice', ['invoice_transaction' => $invoice]);
$document_object = new DocumentObject(
DocumentType::SHIPPING_INVOICE,
[chunk_split('data:application/pdf;base64,'.base64_encode($transaction_invoice_pdf->output()))],
'',
ApprovalStatus::COMPLETED,
'shipping_invoice'
);
$document =$this->createsDocument->execute($invoice, $document_object);
$this->createsFiles->execute($document, $document_object);
// dump($document);
return $this->response([]);
}
}
app/Http/Controllers/Transactions/RegenerateSingleShippingInvoiceTransactionController.php
+21
View File
@@ -0,0 +1,21 @@
<?php
namespace App\Http\Controllers\Transactions;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use App\Classes\Modules\Transactions\ControllersLogic\RegenerateSingleShippingInvoiceTransactionLogic;
class RegenerateSingleShippingInvoiceTransactionController
{
/**
* @param Request $request
* @param RegenerateShippingInvoiceTransactionLogic $logic
* @return JsonResponse
*/
public function regenerate(Request $request, RegenerateSingleShippingInvoiceTransactionLogic $logic) : JsonResponse {
return $logic->execute($request);
}
}
app/Http/Resources/HelpMenuQuestionResource.php
+1 -1
View File
@@ -34,7 +34,7 @@ class HelpMenuQuestionResource extends JsonResource
'question_number' => $q->question_number,
'question_text' => $q->question_text,
'question_type' => $q->question_type,
'question_answers' => HelpMenuAnswerOptionsResource::collection(QAAnswerOptions::where('question_number', $q->question_number)->where('questionnaire_set_id', $q->questionnaire_set_id)->get()),
'question_answers' => HelpMenuAnswerOptionsResource::collection(QAAnswerOptions::where('question_number', $q->question_number)->where('questionnaire_set_id', $q->questionnaire_set_id)->orderBy('order', 'ASC')->get()),
'questionnaire_set_id' => $q->questionnaire_set_id,
'next_nested_question' => $q->next_nested_question,
'next_main_question' => $q->next_main_question,
app/Http/Resources/HelpMenuQuestionnaireSetsResource.php
+1
View File
@@ -18,6 +18,7 @@ class HelpMenuQuestionnaireSetsResource extends JsonResource
'name' => $this->name,
'description' => $this->description,
'group' => $this->group,
'version' => $this->version,
];
}
}
app/Http/Resources/HelpMenuQuestionsAnswersResource.php
+4 -1
View File
@@ -4,6 +4,7 @@ namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
use App\Classes\ValueObjects\Constants\QASystemSourceType;
use App\Models\QAAnswerOptions;
use App\Models\QAQuestions;
use Carbon\Carbon;
@@ -20,6 +21,7 @@ class HelpMenuQuestionsAnswersResource extends JsonResource
$question = QAQuestions::where('id', $this->question_id)->first();
$source = new HelpMenuUserSourceResource($this->userSource);
$user = $this->source_id === 0 ? new UserResource($this->user) : null;
$answerOption = QAAnswerOptions::where('id', $this->answer_option_id)->first();
$user_marking = '';
if($user){
@@ -31,7 +33,8 @@ class HelpMenuQuestionsAnswersResource extends JsonResource
'question_id' => $this->question_id,
'questionnaire' => new HelpMenuQuestionnaireSetsResource($this->question->questionnaire),
'question_text' => $question ? $question->question_text : null,
'free_text_answer' => $this->free_text_answer,
'free_text_answer' => $answerOption ? $answerOption->display_text : null,
'answer_value' => $answerOption ? $answerOption->value : null,
'source_system' => $user ? QASystemSourceType::getText(QASystemSourceType::IZYIM) : QASystemSourceType::getText($source->system),
'source_marking' => $user ? $user_marking : $source->marking,
'source_email' => $user ? $user->email : $source->email,
app/Http/Resources/WalletTransactionResource.php
+2
View File
@@ -33,12 +33,14 @@ class WalletTransactionResource extends JsonResource
case TransactionType::PAYMENT:
$invoice = Transaction::where('payment_reference', $this->bill_no)->first();
if(!$invoice) {
Log::channel('paymentUnknownOrderLog')->info('ID: ' . $this->id);
$description = 'Payment for unknown invoice, please contact tech support.';
break;
}
$order = $invoice->owner->owner->owner;
if(!$order) {
Log::channel('paymentUnknownOrderLog')->info('ID: ' . $this->id);
$description = 'Payment for unknown order, please contact tech support.';
break;
}
app/Models/QAUserAnswerSelected.php
+9
View File
@@ -46,4 +46,13 @@ class QAUserAnswerSelected extends AbstractModel implements Documentable
return $this->BelongsTo(QAQuestions::class, 'question_id', 'id');
}
/**
* @return BelongsTo
*/
public function answer(): BelongsTo
{
return $this->BelongsTo(QAAnswerOptions::class, 'answer_option_id', 'id');
}
}
config/logging.php
+6
View File
@@ -106,6 +106,12 @@ return [
'emergency' => [
'path' => storage_path('logs/laravel.log'),
],
'paymentUnknownOrderLog' => [
'driver' => 'single',
'path' => storage_path('logs/paymentUnknownOrderLog.log'),
'level' => 'info',
],
],
];
database/seeders/DatabaseSeeder.php
+5
View File
@@ -26,7 +26,12 @@ class DatabaseSeeder extends Seeder
// $this->call(QAQuestionsDemoSeeder::class); //DEMO POC
// $this->call(QAAnswerOptionsDemoSeeder::class); //DEMO POC
// 20230928 Set 1 to Set 3
// $this->call(QAQuestionsSeeder::class);
// $this->call(QAAnswerOptionsSeeder::class);
// 20231121 Set 4 to Set 6
// $this->call(QAQuestions2Seeder::class);
// $this->call(QAAnswerOptions2Seeder::class);
}
}
database/seeders/QAAnswerOptions2Seeder.php
+395
View File
@@ -0,0 +1,395 @@
<?php
namespace Database\Seeders;
use Illuminate\Database\Seeder;
use App\Models\QAAnswerOptions;
class QAAnswerOptions2Seeder extends Seeder
{
public function run()
{
// Set 1
// Option 1 for Question 10
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Very Dissatisfied";
$answerOption->value = "1";
$answerOption->order = 1;
$answerOption->question_number = 10;
$answerOption->questionnaire_set_id = 4;
$answerOption->save();
// Option 2 for Question 10
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Dissatisfied";
$answerOption->value = "2";
$answerOption->order = 2;
$answerOption->question_number = 10;
$answerOption->questionnaire_set_id = 4;
$answerOption->save();
// Option 3 for Question 10
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Neutral";
$answerOption->value = "3";
$answerOption->order = 3;
$answerOption->question_number = 10;
$answerOption->questionnaire_set_id = 4;
$answerOption->save();
// Option 4 for Question 10
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Satisfied";
$answerOption->value = "4";
$answerOption->order = 4;
$answerOption->question_number = 10;
$answerOption->questionnaire_set_id = 4;
$answerOption->save();
// Option 5 for Question 10
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Very Satisfied";
$answerOption->value = "5";
$answerOption->order = 5;
$answerOption->question_number = 10;
$answerOption->questionnaire_set_id = 4;
$answerOption->save();
// Set 1
// Option 1 for Question 20
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Yes";
$answerOption->value = "3";
$answerOption->order = 3;
$answerOption->question_number = 20;
$answerOption->questionnaire_set_id = 4;
$answerOption->save();
// Option 2 for Question 20
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Partially";
$answerOption->value = "2";
$answerOption->order = 2;
$answerOption->question_number = 20;
$answerOption->questionnaire_set_id = 4;
$answerOption->save();
// Option 3 for Question 20
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "No";
$answerOption->value = "1";
$answerOption->order = 1;
$answerOption->question_number = 20;
$answerOption->questionnaire_set_id = 4;
$answerOption->save();
// Set 1
// Option 1 for Question 30
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Very Clear";
$answerOption->value = "5";
$answerOption->order = 5;
$answerOption->question_number = 30;
$answerOption->questionnaire_set_id = 4;
$answerOption->save();
// Option 2 for Question 30
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Clear";
$answerOption->value = "4";
$answerOption->order = 4;
$answerOption->question_number = 30;
$answerOption->questionnaire_set_id = 4;
$answerOption->save();
// Option 3 for Question 30
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Neutral";
$answerOption->value = "3";
$answerOption->order = 3;
$answerOption->question_number = 30;
$answerOption->questionnaire_set_id = 4;
$answerOption->save();
// Option 4 for Question 30
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Unclear";
$answerOption->value = "2";
$answerOption->order = 2;
$answerOption->question_number = 30;
$answerOption->questionnaire_set_id = 4;
$answerOption->save();
// Option 5 for Question 30
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Very Unclear";
$answerOption->value = "1";
$answerOption->order = 1;
$answerOption->question_number = 30;
$answerOption->questionnaire_set_id = 4;
$answerOption->save();
// Set 2
// Option 1 for Question 10
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Yes";
$answerOption->value = "3";
$answerOption->order = 3;
$answerOption->question_number = 10;
$answerOption->questionnaire_set_id = 5;
$answerOption->save();
// Option 2 for Question 10
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Somewhat";
$answerOption->value = "2";
$answerOption->order = 2;
$answerOption->question_number = 10;
$answerOption->questionnaire_set_id = 5;
$answerOption->save();
// Option 3 for Question 10
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "No";
$answerOption->value = "1";
$answerOption->order = 1;
$answerOption->question_number = 10;
$answerOption->questionnaire_set_id = 5;
$answerOption->save();
// Set 2
// Option 1 for Question 20
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Exceeded Expectations";
$answerOption->value = "3";
$answerOption->order = 3;
$answerOption->question_number = 20;
$answerOption->questionnaire_set_id = 5;
$answerOption->save();
// Option 2 for Question 20
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Met Expectations";
$answerOption->value = "2";
$answerOption->order = 2;
$answerOption->question_number = 20;
$answerOption->questionnaire_set_id = 5;
$answerOption->save();
// Option 3 for Question 20
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Below Expectations";
$answerOption->value = "1";
$answerOption->order = 1;
$answerOption->question_number = 20;
$answerOption->questionnaire_set_id = 5;
$answerOption->save();
// Set 2
// Option 1 for Question 30
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Very Dissatisfied";
$answerOption->value = "1";
$answerOption->order = 1;
$answerOption->question_number = 30;
$answerOption->questionnaire_set_id = 5;
$answerOption->save();
// Option 2 for Question 30
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Dissatisfied";
$answerOption->value = "2";
$answerOption->order = 2;
$answerOption->question_number = 30;
$answerOption->questionnaire_set_id = 5;
$answerOption->save();
// Option 3 for Question 30
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Neutral";
$answerOption->value = "3";
$answerOption->order = 3;
$answerOption->question_number = 30;
$answerOption->questionnaire_set_id = 5;
$answerOption->save();
// Option 4 for Question 30
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Satisfied";
$answerOption->value = "4";
$answerOption->order = 4;
$answerOption->question_number = 30;
$answerOption->questionnaire_set_id = 5;
$answerOption->save();
// Option 5 for Question 30
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Very Satisfied";
$answerOption->value = "5";
$answerOption->order = 5;
$answerOption->question_number = 30;
$answerOption->questionnaire_set_id = 5;
$answerOption->save();
// Set 3
// Option 1 for Question 10
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Immediately";
$answerOption->value = "5";
$answerOption->order = 5;
$answerOption->question_number = 10;
$answerOption->questionnaire_set_id = 6;
$answerOption->save();
// Option 2 for Question 10
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Within a few hours";
$answerOption->value = "4";
$answerOption->order = 4;
$answerOption->question_number = 10;
$answerOption->questionnaire_set_id = 6;
$answerOption->save();
// Option 3 for Question 10
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Within a day";
$answerOption->value = "3";
$answerOption->order = 3;
$answerOption->question_number = 10;
$answerOption->questionnaire_set_id = 6;
$answerOption->save();
// Option 4 for Question 10
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "More than a day";
$answerOption->value = "2";
$answerOption->order = 2;
$answerOption->question_number = 10;
$answerOption->questionnaire_set_id = 6;
$answerOption->save();
// Option 5 for Question 10
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Never received a response";
$answerOption->value = "1";
$answerOption->order = 1;
$answerOption->question_number = 10;
$answerOption->questionnaire_set_id = 6;
$answerOption->save();
// Set 3
// Option 1 for Question 20
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Very Clear";
$answerOption->value = "5";
$answerOption->order = 5;
$answerOption->question_number = 20;
$answerOption->questionnaire_set_id = 6;
$answerOption->save();
// Option 2 for Question 20
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Clear";
$answerOption->value = "4";
$answerOption->order = 4;
$answerOption->question_number = 20;
$answerOption->questionnaire_set_id = 6;
$answerOption->save();
// Option 3 for Question 20
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Neutral";
$answerOption->value = "3";
$answerOption->order = 3;
$answerOption->question_number = 20;
$answerOption->questionnaire_set_id = 6;
$answerOption->save();
// Option 4 for Question 20
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Unclear";
$answerOption->value = "2";
$answerOption->order = 2;
$answerOption->question_number = 20;
$answerOption->questionnaire_set_id = 6;
$answerOption->save();
// Option 5 for Question 20
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Very Unclear";
$answerOption->value = "1";
$answerOption->order = 1;
$answerOption->question_number = 20;
$answerOption->questionnaire_set_id = 6;
$answerOption->save();
// Set 3
// Option 1 for Question 30
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Very Likely";
$answerOption->value = "5";
$answerOption->order = 5;
$answerOption->question_number = 30;
$answerOption->questionnaire_set_id = 6;
$answerOption->save();
// Option 2 for Question 30
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Likely";
$answerOption->value = "4";
$answerOption->order = 4;
$answerOption->question_number = 30;
$answerOption->questionnaire_set_id = 6;
$answerOption->save();
// Option 3 for Question 30
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Neutral";
$answerOption->value = "3";
$answerOption->order = 3;
$answerOption->question_number = 30;
$answerOption->questionnaire_set_id = 6;
$answerOption->save();
// Option 4 for Question 30
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Unlikely";
$answerOption->value = "2";
$answerOption->order = 2;
$answerOption->question_number = 30;
$answerOption->questionnaire_set_id = 6;
$answerOption->save();
// Option 5 for Question 30
$answerOption = new QAAnswerOptions;
$answerOption->display_text = "Very Unlikely";
$answerOption->value = "1";
$answerOption->order = 1;
$answerOption->question_number = 30;
$answerOption->questionnaire_set_id = 6;
$answerOption->save();
}
}
database/seeders/QAQuestions2Seeder.php
+148
View File
@@ -0,0 +1,148 @@
<?php
namespace Database\Seeders;
use Illuminate\Database\Seeder;
use App\Models\QAQuestionnaireSet;
use App\Models\QAQuestions;
use App\Classes\ValueObjects\Constants\QAType;
class QAQuestions2Seeder extends Seeder
{
public function run()
{
$questionnaireSets = [
[
'name' => 'Set 1',
'description' => 'Customer Support Satisfaction Survey',
'group' => 'feedback',
'version' => 2
],
[
'name' => 'Set 2',
'description' => 'First Order Experience Feedback',
'group' => 'feedback',
'version' => 2
],
[
'name' => 'Set 3',
'description' => 'Sales Inquiry Experience',
'group' => 'feedback',
'version' => 2
],
];
foreach ($questionnaireSets as $set) {
$questionnaireSet = QAQuestionnaireSet::create([
'name' => $set['name'],
'description' => $set['description'],
'group' => $set['group'],
'version' => $set['version'],
]);
$questions = [];
switch ($set['name']) {
case 'Set 1':
$questions = [
[
'question_number' => 10,
'question_text' => 'How satisfied are you with the time it took to receive a response?',
'question_type' => QAType::MULTIPLE_CHOICES,
'is_start' => true,
'is_end' => false,
],
[
'question_number' => 20,
'question_text' => 'Was your issue resolved during this interaction?',
'question_type' => QAType::MULTIPLE_CHOICES,
'is_start' => false,
'is_end' => false,
],
[
'question_number' => 30,
'question_text' => 'How clear and understandable was the communication from the support team?',
'question_type' => QAType::MULTIPLE_CHOICES,
'is_start' => false,
'is_end' => true,
]
];
break;
case 'Set 2':
$questions = [
[
'question_number' => 10,
'question_text' => 'Did you find what you were looking for without any issues?',
'question_type' => QAType::MULTIPLE_CHOICES,
'is_start' => true,
'is_end' => false,
],
[
'question_number' => 20,
'question_text' => 'Did the service meet your expectations?',
'question_type' => QAType::MULTIPLE_CHOICES,
'is_start' => false,
'is_end' => false,
],
[
'question_number' => 30,
'question_text' => 'How satisfied are you with the delivery time?',
'question_type' => QAType::MULTIPLE_CHOICES,
'is_start' => false,
'is_end' => true,
]
];
break;
case 'Set 3':
$questions = [
[
'question_number' => 10,
'question_text' => 'How quickly did our sales team respond to your inquiry?',
'question_type' => QAType::MULTIPLE_CHOICES,
'is_start' => true,
'is_end' => false,
],
[
'question_number' => 20,
'question_text' => 'Was the information provided by our sales team clear and easy to understand?',
'question_type' => QAType::MULTIPLE_CHOICES,
'is_start' => false,
'is_end' => false,
],
[
'question_number' => 30,
'question_text' => 'After interacting with our sales team, how likely are you to use our service?',
'question_type' => QAType::MULTIPLE_CHOICES,
'is_start' => false,
'is_end' => true,
]
];
break;
}
foreach ($questions as $key => $questionData) {
$question = new QAQuestions;
$question->question_number = $questionData['question_number'];
$question->question_text = $questionData['question_text'];
$question->question_type = $questionData['question_type'];
$question->questionnaire_set_id = $questionnaireSet->id;
if (isset($questionData['next_nested_question'])) {
$question->next_nested_question = $questionData['next_nested_question'];
}
if (isset($questionData['next_main_question'])) {
$question->next_main_question = $questionData['next_main_question'];
}
$question->is_start = $questionData['is_start'];
$question->is_end = $questionData['is_end'];
if (isset($questionData['end_text'])) {
$question->end_text = $questionData['end_text'];
}
$question->order = $key + 1;
$question->save();
}
}
}
}
resources/assets/vue/components/companies/sections/CustomerPaymentBillingSectionComponent.vue
+1 -1
View File
@@ -1,7 +1,7 @@
<template>
<div class="row">
<div class="col">
<div v-if="$store.getters.isAdmin" class="btn btn-sm btn-danger pointer m-t-10 m-b-15 d-none" @click="submit(route('api.transaction.invoice.company.regenerate', company_module_id), 'post', section, true , true)">Regenerate Invoice</div>
<div v-if="$store.getters.isAdmin" class="btn btn-sm btn-danger pointer m-t-10 m-b-15" @click="submit(route('api.transaction.invoice.company.regenerate', company_module_id), 'post', section, true , true)">Regenerate Invoice</div>
<div class="row flex-nowrap">
<div class="col">
<div class="row tabsContainer">
resources/assets/vue/components/companies/sections/OnBoardingSectionComponent.vue
+1 -1
View File
@@ -7,7 +7,7 @@
<div class="col">
<div class="row align-items-center justify-content-center m-b-10">
<div class="col-auto p-r-10">
<h5 class="light">Welcome Abroad <span class="text-primary">{{$store.getters.getUserName}}</span>, we provide logistics services.</h5>
<h5 class="light">Welcome Aboard <span class="text-primary">{{$store.getters.getUserName}}</span>, we provide logistics services.</h5>
</div>
<div class="col-auto b-a b-thick b-primary padding-5">
<h5 class="light no-margin">Powered by technology, delivered by experts.</h5>
resources/assets/vue/components/feedback/elements/QuestionAnswerComponent.vue
+2
View File
@@ -1,8 +1,10 @@
<template>
<div class="row parentContainer">
<div class="col-1">{{ item.questionnaire.version }}</div>
<div class="col-1">{{ item.questionnaire.description }}</div>
<div class="col-2"> <p>{{ item.question_text }}</p> </div>
<div class="col-1">{{ item.free_text_answer }}</div>
<div class="col-1">{{ item.answer_value }}</div>
<div class="col-1">{{ item.source_system }}</div>
<div class="col-1">{{ item.source_marking }}</div>
<div class="col-2">{{ item.source_email }}</div>
resources/assets/vue/components/feedback/forms/GenerateFeedbackLinkFormComponent.vue
+1 -1
View File
@@ -13,7 +13,7 @@
<div class="col-12 col-md-8">
<validation-wrapper-component selectable class="m-b-15" :validator="$v.parameters.question_set">
<label class="text-primary">Question Set</label>
<select-component :options="[{'id': 1, 'text': 'Customer Support Satisfaction Survey'}, {'id': 2, 'text': 'First Order Experience Feedback'}, {'id': 3, 'text': 'Sales Inquiry Experience'}]" v-model="parameters.question_set"></select-component>
<select-component :options="[{'id': 4, 'text': 'Customer Support Satisfaction Survey'}, {'id': 5, 'text': 'First Order Experience Feedback'}, {'id': 6, 'text': 'Sales Inquiry Experience'}]" v-model="parameters.question_set"></select-component>
</validation-wrapper-component>
</div>
resources/assets/vue/components/paymentsBilling/elements/AdminPaymentsBillingComponent.vue
+14 -28
View File
@@ -84,6 +84,20 @@
<address-form-component :id="item.order.company_module.id" :section="section" :type=1></address-form-component>
</modal-component>
</div>
<div class="row" v-if="item.order.company_module.billingAddress">
<div class="col">
<div class="col-auto requestModal pointer" data-type="editBillingAddress">
<i class="fa fa-edit pointer fa-fw m-l-5"></i> Edit billing Address
</div>
<modal-component class="animate__animated animate__fast animate__fadeIn" size="extra-large" styleType="fill-in" type="editBillingAddress">
<div class="row">
<div class="col bg-white">
<address-form-component :id="item.order.company_module.id" :data="item.order.company_module.billingAddress" section="editBillingAddress"></address-form-component>
</div>
</div>
</modal-component>
</div>
</div>
<div v-if="!item.order.address.post_code_area">
<div class="btn btn-xs btn-primary pointer m-t-10 requestModal btn-block" data-type="defineLocation">Define Location</div>
<modal-component class="animate_animated animatefast animate_fadeIn" styleType="fill-in" type="defineLocation">
@@ -110,34 +124,6 @@
</modal-component>
</div>
</div>
<div class="row text-center parentContainer m-t-10" v-if="['Pending Invoice', 'Pending Approval'].includes(invoice_status)" >
<div class="col" v-if="item.order">
<div class="row" v-if="!item.order.company_module.billingAddress">
<div class="col">
<div>
<div class="btn btn-primary btn-xs pointer requestModal btn-block" data-type="billingAddressComponent">Add Billing Address</div>
<modal-component class="animate__animated animate__fast animate__fadeIn" size="extra-large" styleType="fill-in" type="billingAddressComponent">
<address-form-component :id="item.order.company_module.id" :section="section" :type=1></address-form-component>
</modal-component>
</div>
</div>
</div>
<div class="row" v-if="item.order.company_module.billingAddress">
<div class="col">
<div class="col-auto requestModal pointer" data-type="editBillingAddress">
<i class="fa fa-edit pointer fa-fw m-l-5"></i> Edit billing Address
</div>
<modal-component class="animate__animated animate__fast animate__fadeIn" size="extra-large" styleType="fill-in" type="editBillingAddress">
<div class="row">
<div class="col bg-white">
<address-form-component :id="item.order.company_module.id" :data="item.order.company_module.billingAddress" section="editBillingAddress"></address-form-component>
</div>
</div>
</modal-component>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingComponent.vue
+15
View File
@@ -64,6 +64,21 @@
</div>
</div>
<div class="col-auto p-l-0 p-r-0 d-flex justify-content-center align-items-center" v-if="$store.getters.isSuperAdmin">
<span class="d-inline-block m-r-15 text-primary bold text-underline pointer requestModal" data-type="regenerateInvoice">
<i class="fa fa-repeat"></i>
</span>
<modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="regenerateInvoice">
<general-confirmation-form-component
contentText="Are you sure you want to regenerate this Invoice?"
modalType="delete"
buttonText="Regenerate"
class="text-center"
:apiRoute="route('api.transaction.invoice.regenerate', item.id)"
apiMethod="post"
:section="section"
>
</general-confirmation-form-component>
</modal-component>
<span class="d-inline-block m-r-15 text-primary bold text-underline pointer requestModal" data-type="deleteInvoice">
<i class="fa fa-close"></i>
</span>
resources/views/pages/dashboards/customer.blade.php
+1 -1
View File
@@ -10,7 +10,7 @@
<div class="col">
<div class="row align-items-center justify-content-center m-b-10">
<div class="col-auto p-r-10">
<h5 class="light">Welcome Abroad, we provide logistics services.</h5>
<h5 class="light">Welcome Aboard, we provide logistics services.</h5>
</div>
<div class="col-auto b-a b-thick b-primary padding-5">
<h5 class="light no-margin">Powered by technology, delivered by experts.</h5>
resources/views/pages/feedback.blade.php
+3 -1
View File
@@ -25,9 +25,11 @@
</button>
</anchor-link-component>
<div class="row align-items-center m-t-10 p-t-10 p-b-10 b-t b-grey muted all-caps fs-10">
<div class="col-1">Version</div>
<div class="col-1">Question Set</div>
<div class="col-2">Question Text</div>
<div class="col-1">Answer</div>
<div class="col-1">Answer Text</div>
<div class="col-1">Answer Value</div>
<div class="col-1">Source System</div>
<div class="col-1">Source Marking</div>
<div class="col-2">Source Email</div>
resources/views/pages/feedback/customer.blade.php
+1
View File
@@ -1,4 +1,5 @@
@extends('layouts.base_no_login')
@section('title', 'Share Your Feedback - CIEF Customer Service')
@section('inner_content')
<feedback-customer-section-component token="{{$token}}"></feedback-customer-section-component>
@endsection
resources/views/pages/pdfs/packing_list_measurement.blade.php
+6 -2
View File
@@ -43,9 +43,12 @@
</thead>
<tbody>
@php
$packages = $invoice_transaction->owner->packages;
$billable_packing_list = $invoice_transaction->owner->packingLists()->first();
$billable_packing_list = $billable_packing_list ? $billable_packing_list : $invoice_transaction->owner;
$packages = $billable_packing_list->packages;
$totalCBM = 0;
$totalQty = 0;
$order_reference = $invoice_transaction->owner->owner ? $invoice_transaction->owner->owner->reference : null;
@endphp
@foreach ($packages as $key => $package)
@php
@@ -57,7 +60,8 @@
@endphp
<tr>
<td width="5%" class="center top">{{ $key + 1 }}</td>
<td class="description">{!! $package->description !!}</td>
<!-- <td class="description">{!! $package->description !!}</td> -->
<td class="description">{!! $order_reference . '<br>' . $billable_packing_list->owner->reference !!}</td>
<td width="15%" class="center top" style="text-align: center">
{!! $measurement !!}
</td>
resources/views/pages/pdfs/shipping_invoices_combined.blade.php
+2
View File
@@ -129,6 +129,8 @@ $grandSubTotal = 0;
@foreach ($invoice_transactions as $transaction)
<pagebreak />
@include('pages.pdfs.shipping_invoice_inner', ['invoice_transaction' => $transaction])
<pagebreak />
@include('pages.pdfs.packing_list_measurement', ['invoice_transaction' => $transaction])
@endforeach
resources/views/vendor/head.blade.php
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@
<meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
<meta charset="utf-8"/>
<title>IZYIM Shipping</title>
<title>@yield('title', 'IZYIM Shipping')</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, shrink-to-fit=no"/>
<link rel="apple-touch-icon" sizes="57x57" href="{{asset('images/favicon/apple-icon-57x57.png')}}">
<link rel="apple-touch-icon" sizes="60x60" href="{{asset('images/favicon/apple-icon-60x60.png')}}">
routes/transaction.php
+1
View File
@@ -9,6 +9,7 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
Route::delete('/delete/{id}', 'DeleteTransactionController@delete')->name('delete');
Route::delete('/delete-payment/{id}', 'DeletePaymentTransactionController@delete')->name('payment.delete');
Route::put('{id}/status/update/{status}', 'UpdateTransactionStatusController@update')->where('status', 'approve|expire|reject')->name('update');
route::post('/{invoice_id}/regenerate', 'RegenerateSingleShippingInvoiceTransactionController@regenerate')->name('invoice.regenerate');
Route::get('wallet/list', 'ListWalletTransactionsController@list')->name('wallet.list');
routes/web.php
+26 -12
View File
@@ -1,11 +1,8 @@
<?php
use App\Classes\Exceptions\InternalServerErrorException;
use App\Classes\Jobs\FetchContainersStatusUpdateFromVTPortalJob;
use App\Classes\Jobs\FetchDeliveryListFromVTPortalJob;
use App\Classes\Jobs\FetchLoadedContainersFromVTPortalJob;
use App\Classes\Jobs\FetchOrdersFromYDPortalJob;
use App\Classes\Jobs\FetchPackingListFromVTPortalJob;
use App\Classes\Jobs\FetchWarehouseReceiveListFromVTPortalJob;
use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
use App\Classes\Modules\Documents\Services\CreatesDocument;
@@ -16,12 +13,9 @@ use App\Classes\Modules\PackingLists\Processors\FetchContainersFromYdPortalProce
use App\Classes\Modules\PackingLists\Processors\FetchContainersUpdatesFromYdPortalProcessor;
use App\Classes\Modules\PackingLists\Processors\FetchDeliveryUpdatesFromYdPortalProcessor;
use App\Classes\Modules\PackingLists\Processors\FetchLoadedContainersFromVTPortalProcessor;
use App\Classes\Modules\PackingLists\Processors\FetchOrderListsFromYdPortalProcessor;
use App\Classes\Modules\PackingLists\Processors\FetchPackingListFromVTPortalProcessor;
use App\Classes\Modules\PackingLists\Processors\FetchPackingListsFromYdPortalProcessor;
use App\Classes\Modules\PackingLists\Services\ListsPackingLists;
use App\Classes\Modules\Transactions\Processors\ApproveShippingInvoiceTransactionProcessor;
use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionProcessor;
use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
use App\Classes\ValueObjects\Constants\ApprovalStatus;
use App\Classes\ValueObjects\Constants\BusinessType;
use App\Classes\ValueObjects\Constants\DocumentType;
@@ -30,7 +24,6 @@ use App\Classes\ValueObjects\Constants\PackageType;
use App\Classes\ValueObjects\Constants\PackingListType;
use App\Classes\ValueObjects\Constants\PaymentMethodType;
use App\Classes\ValueObjects\Constants\TransactionType;
use App\Http\Resources\CompanyResource;
use App\Models\CompanyConnection;
use App\Models\CompanyModule;
use App\Models\Document;
@@ -1227,10 +1220,31 @@ Route::get('/wallets/active', function(){
echo '</table>';
});
Route::get('/accident-approve-invoice', function(){
$invoices = Transaction::where('type', TransactionType::SHIPPING_INVOICE)->whereDate('updated_at', '2023-10-12')->get();
Route::get('fix-payment-status-updated-but-failed-update-invoice', function (UpdatesTransactionStatus $updatesTransactionStatus, UpdateDoFromVTPortalProcessor $updateDoFromVTPortalProcessor, UpdateDoFromYDPortalProcessor $updateDoFromYDPortalProcessor) {
$invoices = Transaction::where('type', TransactionType::SHIPPING_INVOICE)->whereIn('status', [2])
->whereHas('transactions', function ($query) {
$query->where('type', TransactionType::PAYMENT)
->whereIn('status', [2, 3]);
})->get();
foreach ($invoices as $invoice) {
$orderMarking = $invoice->owner->owner->reference;
echo '<a href="'.route('order.v2.show', $orderMarking).'" target="_blank">'.$orderMarking.'</a><br>';
echo "Fixing" . $invoice->owner->owner->reference . '<br>';
$totalPaidAmount = $invoice->transactions->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])->sum('amount');
if (($invoice->amount - $totalPaidAmount) < 0.01) {
$updatesTransactionStatus->execute($invoice, ApprovalStatus::COMPLETED);
$packingList = $invoice->owner;
$packingList->status = ApprovalStatus::APPROVED;
$packingList->save();
if (app()->environment('production')) {
$updateDoFromVTPortalProcessor->execute($packingList);
$updateDoFromYDPortalProcessor->execute($packingList);
}
echo 'done fix ' . $invoice->owner->owner->reference . '<br>';
}
}
});