diff --git a/app/Http/Controllers/SenderIdController.php b/app/Http/Controllers/SenderIdController.php index 8ec4ccc..fb596b0 100644 --- a/app/Http/Controllers/SenderIdController.php +++ b/app/Http/Controllers/SenderIdController.php @@ -283,14 +283,12 @@ class SenderIdController extends Controller public function getUploadReport($name){ $file = public_path('documents/general_files/') . $name; $headers = ['Content-Type' => 'text/plain ']; - return \Response::download($file, 'Sender ID Upload Report', $headers); + return \Response::download($file, 'Sender ID Upload Report.xlsx', $headers); } public function getSampleFile(){ $file = public_path('helper_documents/senderid_sample_file.xlsx'); - - #$extension = pathinfo($file, PATHINFO_EXTENSION); $headers = ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']; - return \Response::download($file, 'Sender ID Sample Upload File', $headers); + return \Response::download($file, 'Sender ID Sample Upload File.xlsx', $headers); } public function edit($id){ $senderid = Models\SenderId::findOrFail($id); diff --git a/public/assets/img/cml-final-3.png b/public/assets/img/cml-final-3.png new file mode 100644 index 0000000..97f9d12 Binary files /dev/null and b/public/assets/img/cml-final-3.png differ diff --git a/public/assets/img/ClickMobile_final_logo copy.png b/public/assets/img/cml-logo-final.png similarity index 100% rename from public/assets/img/ClickMobile_final_logo copy.png rename to public/assets/img/cml-logo-final.png diff --git a/public/assets/js/senderid.js b/public/assets/js/senderid.js index d6d074b..e550cbd 100644 --- a/public/assets/js/senderid.js +++ b/public/assets/js/senderid.js @@ -36,8 +36,8 @@ $(document).ready(function(){ // $('#mnoDivEdit').removeClass('hidden'); // $('#supplierDivEdit').addClass('hidden'); $('#supplierNameEdit').attr('required', false); - $('#supplierNameEdit').attr('disabled', false); - $('#networkNameEdit').attr('disabled', true); + $('#supplierNameEdit').attr('disabled', true); + $('#networkNameEdit').attr('disabled', false); } else if(directMnoSelectionEditStart == 'NO'){ console.log('in the NO in Edit | at rest'); diff --git a/public/documents/general_files/erp_1764328824pKdQDj.xlsx b/public/documents/general_files/erp_1764328824pKdQDj.xlsx new file mode 100644 index 0000000..044ffef Binary files /dev/null and b/public/documents/general_files/erp_1764328824pKdQDj.xlsx differ diff --git a/public/documents/general_files/erp_1764328824pKdQDj.xlsx_rejected_rows.txt b/public/documents/general_files/erp_1764328824pKdQDj.xlsx_rejected_rows.txt new file mode 100644 index 0000000..78f1d3e --- /dev/null +++ b/public/documents/general_files/erp_1764328824pKdQDj.xlsx_rejected_rows.txt @@ -0,0 +1,23 @@ +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":"_"} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null} diff --git a/public/documents/general_files/erp_1764333597V6OQz6.xlsx b/public/documents/general_files/erp_1764333597V6OQz6.xlsx new file mode 100644 index 0000000..984a376 Binary files /dev/null and b/public/documents/general_files/erp_1764333597V6OQz6.xlsx differ diff --git a/public/documents/general_files/erp_1764333597V6OQz6.xlsx_rejected_rows.txt b/public/documents/general_files/erp_1764333597V6OQz6.xlsx_rejected_rows.txt new file mode 100644 index 0000000..69fa76b --- /dev/null +++ b/public/documents/general_files/erp_1764333597V6OQz6.xlsx_rejected_rows.txt @@ -0,0 +1 @@ +{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":null,"remarks":null} diff --git a/public/helper_documents/user-mgt.xlsx b/public/helper_documents/user-mgt.xlsx new file mode 100644 index 0000000..adcc74d Binary files /dev/null and b/public/helper_documents/user-mgt.xlsx differ diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php index 12e331e..18bf35b 100755 --- a/resources/views/layouts/master.blade.php +++ b/resources/views/layouts/master.blade.php @@ -56,7 +56,7 @@
- + diff --git a/resources/views/senderid/index.blade.php b/resources/views/senderid/index.blade.php index 318ca62..ff0f2d3 100644 --- a/resources/views/senderid/index.blade.php +++ b/resources/views/senderid/index.blade.php @@ -52,7 +52,7 @@

Sender IDs

- Upload Sender ID + Upload Sender IDs New Sender ID Download All
diff --git a/resources/views/staff_members/profile.blade.php b/resources/views/staff_members/profile.blade.php index e5c099f..d1d3b73 100644 --- a/resources/views/staff_members/profile.blade.php +++ b/resources/views/staff_members/profile.blade.php @@ -96,15 +96,20 @@
-
+
+
+ Name :
+ Designation :
+ Country :
+ DOB :
+
+
+
    @@ -145,38 +150,6 @@
- -
-
- - - - - - - - - - - - - - - - - - - - - - -
#Project NameClient CompanyHours SpentContribution
1New Company Takeover ReviewDeveint Inc18 -
-
-
-
- -

xxFood truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui