diff --git a/app/Classes/Modules/Bookings/ControllersLogic/DeletePurchaseOrderPdfLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/DeletePurchaseOrderPdfLogic.php
index 5bc44d34..79078cd3 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/DeletePurchaseOrderPdfLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/DeletePurchaseOrderPdfLogic.php
@@ -57,7 +57,7 @@ class DeletePurchaseOrderPdfLogic extends AbstractControllerLogic
     {
         $booking = $this->fetchesBooking->execute(['id' => $request->route('id')]);
 
-        $document = $booking->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->first();
+        $document = $booking->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->latest()->first();
 
         $this->canDeleteDocument->passes();
 
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/ImportPurchaseOrderTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/ImportPurchaseOrderTransactionLogic.php
index 4df5799a..aa5eb7e4 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/ImportPurchaseOrderTransactionLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/ImportPurchaseOrderTransactionLogic.php
@@ -6,6 +6,9 @@ namespace App\Classes\Modules\Transactions\ControllersLogic;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Jobs\Commands\V2\ETLPurchaseOrderTransactionV2CommandJob;
 use App\Classes\Modules\Bookings\Services\FetchesBooking;
+use App\Classes\Modules\Documents\Services\CreatesDocument;
+use App\Classes\Modules\Documents\Services\DeletesDocument;
+use App\Classes\Modules\Documents\Services\CreatesFiles;
 use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
 use App\Classes\Modules\Transactions\Processors\CreatePurchaseOrderTransactionProcessor;
@@ -15,8 +18,10 @@ use App\Classes\Modules\Transactions\Standards\Rules\CanETLPurchaseOrder;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\DocumentType;
 use App\Http\Resources\TransactionResource;
 use App\Models\Booking;
+use App\Models\Document;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
@@ -53,6 +58,15 @@ class ImportPurchaseOrderTransactionLogic extends AbstractControllerLogic
     /** @var CanETLPurchaseOrder */
     private $canETLPurchaseOrder;
 
+    /** @var CreatesDocument */
+    private $createsDocument;
+
+    /** @var DeletesDocument */
+    private $deletesDocument;
+
+    /** @var CreatesFiles */
+    private $createsFile;
+
     /**
      * ImportPurchaseOrderTransactionLogic constructor.
      * @param FetchesBooking $fetchesBooking
@@ -60,14 +74,20 @@ class ImportPurchaseOrderTransactionLogic extends AbstractControllerLogic
      * @param CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor
      * @param ETLPDFPurchaseOrderClaudeProcessor $eTLPDFPurchaseOrderClaudeProcessor
      * @param CanETLPurchaseOrder $canETLPurchaseOrder
+     * @param CreatesDocument $createsDocument
+     * @param DeletesDocument $deletesDocument
+     * @param CreatesFiles $createsFile
      */
-    public function __construct(FetchesBooking $fetchesBooking, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor, ETLPDFPurchaseOrderClaudeProcessor $eTLPDFPurchaseOrderClaudeProcessor, CanETLPurchaseOrder $canETLPurchaseOrder)
+    public function __construct(FetchesBooking $fetchesBooking, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor, ETLPDFPurchaseOrderClaudeProcessor $eTLPDFPurchaseOrderClaudeProcessor, CanETLPurchaseOrder $canETLPurchaseOrder, CreatesDocument $createsDocument, DeletesDocument $deletesDocument, CreatesFiles $createsFile)
     {
         $this->fetchesBooking = $fetchesBooking;
         $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
         $this->createPurchaseOrderTransactionProcessor = $createPurchaseOrderTransactionProcessor;
         $this->eTLPDFPurchaseOrderClaudeProcessor = $eTLPDFPurchaseOrderClaudeProcessor;
         $this->canETLPurchaseOrder = $canETLPurchaseOrder;
+        $this->createsDocument = $createsDocument;
+        $this->deletesDocument = $deletesDocument;
+        $this->createsFile = $createsFile;
     }
 
     /**
@@ -79,38 +99,80 @@ class ImportPurchaseOrderTransactionLogic extends AbstractControllerLogic
     public function logic(Request $request, $id = ''): JsonResponse
     {
         $products = []; // Initialize
+
+        /** @var Booking $booking */
+        $booking = $this->fetchesBooking->execute(['id' => $request->route('id') ?? $id]);
+
         if ($request->has('products') && is_array($request->input('products'))) {
             $this->canETLPurchaseOrder->passes();
 
             $products = $request->input('products');
 
             if(empty($products)){
-                $files = $request->input('files');
-                $files = $request->input('files');
-
+                $files = $request->input('files', []);
                 $maxSize = 150 * 1024; // 150 KB
                 $totalSize = 0;
 
-                foreach ($files as $index => $fileBase64) {
-                    if (preg_match('/^data:application\/pdf;base64,/', $fileBase64)) {
-                        $fileBase64 = preg_replace('/^data:application\/pdf;base64,/', '', $fileBase64);
+                $base64FilesEN = [];    // files with "EN" in the name
+                $base64FilesOther = []; // files without "EN"
+
+                foreach ($files as $index => $file) {
+                    if (!isset($file['base64'])) {
+                        Log::info("Missing base64 for file index {$index}");
+                        continue;
                     }
 
-                    $fileContent = base64_decode($fileBase64, true);
-                    if ($fileContent === false) {
-                       Log::info("Invalid Base64 for file index {$index}");
-                    }
+                    $fileBase64 = $file['base64'];
+                    $fileName = $file['name'] ?? "file_{$index}";
 
-                    $totalSize += strlen($fileContent);
+                    if (stripos($fileName, 'EN') !== false) {
+                        $base64FilesEN[] = $fileBase64;
+                        if (preg_match('/^data:application\/pdf;base64,/', $fileBase64)) {
+                            $cleanBase64 = preg_replace('/^data:application\/pdf;base64,/', '', $fileBase64);
+                        }
+                        else{
+                            $cleanBase64 = $fileBase64;
+                        }
+
+                        $fileContent = base64_decode($cleanBase64, true);
+                        if ($fileContent === false) {
+                            Log::info("Invalid Base64 for file index {$index}");
+                        }
+
+                        $totalSize += strlen($fileContent);
+                    } else {
+                        $base64FilesOther[] = $fileBase64;
+                    }
                 }
 
-                if ($totalSize > $maxSize) {
-                    ETLPurchaseOrderTransactionV2CommandJob::dispatch($files, $request->route('id'));
-                    $this->notificationMessage = "Please refresh page in a few minutes";
-                    return $this->response([]);
+                //Keep a copy of all PDF files uploaded include pdf file with 'EN' as part of its filename
+                $allBase64Files = array_merge($base64FilesEN, $base64FilesOther);
+
+                $deleteDocument = $booking->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->latest()->first();
+                if($deleteDocument){
+                    $this->deletesDocument->execute($deleteDocument);
+                }
+
+                $object = new DocumentObject(DocumentType::ECOMMERCE_PURCHASE_ORDER, $allBase64Files, '', ApprovalStatus::APPROVED, '1688_purchase_orders');
+
+                /** @var Document $document */
+                $document = $this->createsDocument->execute($booking, $object);
+
+                $this->createsFile->execute($document, $object);
+
+                //ETL only applicable for pdf file with 'EN' as part of its filename
+                if ($totalSize > 0) {
+                    if ($totalSize > $maxSize) {
+                        ETLPurchaseOrderTransactionV2CommandJob::dispatch($base64FilesEN, $request->route('id'));
+                        $this->notificationMessage = "Please refresh page in a few minutes";
+                        return $this->response([]);
+                    }
+                    else{
+                        $products = $this->eTLPDFPurchaseOrderClaudeProcessor->execute($base64FilesEN);
+                    }
                 }
                 else{
-                    $products = $this->eTLPDFPurchaseOrderClaudeProcessor->execute($files);
+                    return $this->response([]);
                 }
             }
         }
@@ -139,9 +201,6 @@ class ImportPurchaseOrderTransactionLogic extends AbstractControllerLogic
 
         }
 
-        /** @var Booking $booking */
-        $booking = $this->fetchesBooking->execute(['id' => $request->route('id') ?? $id]);
-
         $billNumber = $this->generatesTransactionBillNumber->execute('PO-');
 
         $total = collect($products)->sum(function($product){
diff --git a/resources/assets/vue/components/bookings/forms/PdfUpload1688Component.vue b/resources/assets/vue/components/bookings/forms/PdfUpload1688Component.vue
index a0bbeab3..3abd89fb 100644
--- a/resources/assets/vue/components/bookings/forms/PdfUpload1688Component.vue
+++ b/resources/assets/vue/components/bookings/forms/PdfUpload1688Component.vue
@@ -6,7 +6,7 @@
                 <div class="col">
                     <div class="row">
                         <div class="col">
-                            <file-input-component :validator="$v.parameters.files" v-model="parameters.files">
+                            <file-input-component :validator="$v.parameters.files" v-model="parameters.files" :withMeta="true">
                                 <template slot="label">
                                     <div class="font-heading fs-11 text-primary all-caps">Import Purchase Order PDF</div>
                                 </template>
diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
index d0cda96f..212c5c39 100644
--- a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
@@ -351,7 +351,7 @@
                                             </a>
                                         </div>
                                     </div>
-                                    <div class="row m-t-15" v-if="$store.getters.isAdmin && oneSixEightEightServiceIds.includes(booking.service.id) && booking.documents.ecommerce_purchase_order">
+                                    <div class="row m-t-15 m-b-25" v-if="$store.getters.isAdmin && oneSixEightEightServiceIds.includes(booking.service.id) && booking.documents.ecommerce_purchase_order">
                                         <div class="col-sm col-md-auto">
                                             <div class="btn btn-sm btn block all-caps b-rad-none btn-danger pointer requestModal" data-type="deletePo">Delete PO</div>
                                         </div>
@@ -359,7 +359,7 @@
                                             <delete-po-form-component :data="booking" :section="section" class="text-center"></delete-po-form-component>
                                         </modal-component>
                                     </div>
-                                    <div class="row m-b-25" v-if="$store.getters.isAdmin && oneSixEightEightServiceIds.includes(booking.service.id) && booking.status !== 3">
+                                    <!-- <div class="row m-b-25" v-if="$store.getters.isAdmin && oneSixEightEightServiceIds.includes(booking.service.id) && booking.status !== 3">
                                         <div class="col">
                                             <div class="row" v-if="!booking.documents.ecommerce_purchase_order">
                                                 <div class="col">
@@ -367,7 +367,7 @@
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
+                                    </div> -->
                                     <purchase-order-form-component v-if="!oneSixEightEightServiceIds.includes(booking.service.id) || $store.getters.isAdmin || [199, 510].includes($store.getters.getCompanyId) || companySegmentIds.includes(24) || companySegmentIds.includes(36)" :data="booking" :section="section" :companySegmentIds="companySegmentIds"></purchase-order-form-component>
                                 </div>
                             </div>
diff --git a/resources/assets/vue/components/general/forms/FileInputComponent.vue b/resources/assets/vue/components/general/forms/FileInputComponent.vue
index 45ef8a1e..54843296 100644
--- a/resources/assets/vue/components/general/forms/FileInputComponent.vue
+++ b/resources/assets/vue/components/general/forms/FileInputComponent.vue
@@ -26,7 +26,7 @@
                             <slot name="tips"></slot>
                         </div>
                     </div>
-                    <file-upload-component v-model="files" :value="value" v-on:input="$emit('input', $event)"></file-upload-component>
+                    <file-upload-component v-model="files" :value="value" :withMeta="true" v-on:input="$emit('input', $event)"></file-upload-component>
                 </div>
             </div>
         </div>
@@ -40,6 +40,10 @@
                 type: Array,
                 required: false
             },
+            withMeta: {
+                type: Boolean,
+                default: false
+            },
             validator: {
                 required: true
             }
@@ -50,4 +54,4 @@
             }
         }
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/assets/vue/components/general/forms/FileUploadComponent.vue b/resources/assets/vue/components/general/forms/FileUploadComponent.vue
index fbe235fe..c16d046c 100644
--- a/resources/assets/vue/components/general/forms/FileUploadComponent.vue
+++ b/resources/assets/vue/components/general/forms/FileUploadComponent.vue
@@ -65,6 +65,10 @@
             value: {
                 type: Array,
                 required: false
+            },
+            withMeta: {
+                type: Boolean,
+                default: false
             }
         },
         data(){
@@ -142,11 +146,22 @@
         },
         methods: {
             fileToBase64(file) {
+                const vm = this;
                 return new Promise(resolve => {
                     var reader = new FileReader();
 
                     reader.onload = function(event) {
-                        resolve(event.target.result);
+                        // If meta requested, return object
+                        if (vm.withMeta) {
+                            resolve({
+                                name: file.name,
+                                type: file.type,
+                                size: file.size,
+                                base64: event.target.result
+                            });
+                        } else {
+                            resolve(event.target.result);
+                        }
                     };
 
                     reader.readAsDataURL(file);