diff --git a/public/photostrf/234-20250403125300-Screenshot 2023-06-02 184626.png b/public/photostrf/234-20250403125300-Screenshot 2023-06-02 184626.png new file mode 100644 index 0000000..f49d647 Binary files /dev/null and b/public/photostrf/234-20250403125300-Screenshot 2023-06-02 184626.png differ diff --git a/public/photostrf/qrcodes/qrcode_231.png b/public/photostrf/qrcodes/qrcode_231.png new file mode 100644 index 0000000..e1368ef Binary files /dev/null and b/public/photostrf/qrcodes/qrcode_231.png differ diff --git a/public/photostrf/qrcodes/qrcode_233.png b/public/photostrf/qrcodes/qrcode_233.png new file mode 100644 index 0000000..b85bddb Binary files /dev/null and b/public/photostrf/qrcodes/qrcode_233.png differ diff --git a/public/photostrf/qrcodes/qrcode_234.png b/public/photostrf/qrcodes/qrcode_234.png new file mode 100644 index 0000000..7d421f8 Binary files /dev/null and b/public/photostrf/qrcodes/qrcode_234.png differ diff --git a/public/userarea/assets/images/county/uk.svg b/public/userarea/assets/images/county/uk.svg new file mode 100644 index 0000000..2f329da --- /dev/null +++ b/public/userarea/assets/images/county/uk.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/userarea/debug.log b/public/userarea/debug.log index a2cc05b..771fa84 100644 --- a/public/userarea/debug.log +++ b/public/userarea/debug.log @@ -96,3 +96,13 @@ Response: {"meta":{"code":4110,"message":"The value of tracking_number is invali HTTP Code: 400 Error: Create Response: {"meta":{"code":4110,"message":"The value of tracking_number is invalid."},"data":null,"success":false,"http_code":400} +Encoded JSON Data: { + "tracking_number": "750000810057432004040056", + "courier_code": "tnt-it" +} +Request URL: https://api.trackingmore.com/v4/trackings/create +Request Data: {"tracking_number":"750000810057432004040056","courier_code":"tnt-it"} +Response: {"meta":{"code":200,"message":"Request response is successful"},"data":{"id":"9e9652c58e37fc7c8c9b08e9f2eb8f8e","tracking_number":"750000810057432004040056","courier_code":"tnt-it","order_number":"750000810057432004040056","order_date":null,"created_at":"2025-04-03T12:51:49+00:00","update_at":"2025-04-01T09:02:08+00:00","delivery_status":"delivered","archived":"tracking","updating":false,"source":"API","destination_country":"IT","destination_state":"MB","destination_city":"MEDA","origin_country":null,"origin_state":"BS","origin_city":"BRESCIA","tracking_postal_code":null,"tracking_ship_date":null,"tracking_destination_country":null,"tracking_origin_country":null,"tracking_key":null,"tracking_courier_account":null,"customer_name":null,"customer_email":null,"customer_sms":null,"recipient_postcode":null,"order_id":null,"title":null,"logistics_channel":null,"note":null,"label":null,"signed_by":"SIRONI","service_code":"Express","weight":"0,020","weight_kg":null,"product_type":null,"pieces":"1","dimension":"0,001","previously":null,"destination_track_number":null,"exchange_number":null,"scheduled_delivery_date":null,"scheduled_address":null,"substatus":"delivered003","status_info":null,"latest_event":"Spedizione consegnata,COMO,2025-03-25 11:12:00","latest_checkpoint_time":"2025-03-25T11:12:00","transit_time":1,"origin_info":{"courier_code":"tnt-it","courier_phone":"+39 199 803 868","weblink":"http:\/\/www.tnt.it\/","tracking_link":"https:\/\/www.tnt.it\/tracking\/Tracking.do","reference_number":"MY01818480","milestone_date":{"inforeceived_date":null,"pickup_date":"2025-03-24T17:35:00","outfordelivery_date":"2025-03-25T09:31:00","delivery_date":"2025-03-25T11:12:00","returning_date":null,"returned_date":null},"pickup_date":null,"departed_airport_date":null,"arrived_abroad_date":null,"customs_received_date":null,"trackinfo":[{"checkpoint_date":"2025-03-25T11:12:00","checkpoint_delivery_status":"delivered","checkpoint_delivery_substatus":"delivered003","tracking_detail":"Spedizione consegnata","location":"COMO","country_iso2":null,"state":null,"city":null,"zip":null,"raw_status":null},{"checkpoint_date":"2025-03-25T09:31:00","checkpoint_delivery_status":"pickup","checkpoint_delivery_substatus":"pickup001","tracking_detail":"La spedizione e' in consegna in data odierna","location":"COMO","country_iso2":null,"state":null,"city":null,"zip":null,"raw_status":null},{"checkpoint_date":"2025-03-25T01:11:00","checkpoint_delivery_status":"transit","checkpoint_delivery_substatus":"transit001","tracking_detail":"La spedizione e' in transito","location":"COMO","country_iso2":null,"state":null,"city":null,"zip":null,"raw_status":null},{"checkpoint_date":"2025-03-24T17:35:00","checkpoint_delivery_status":"transit","checkpoint_delivery_substatus":"transit001","tracking_detail":"La spedizione e' regolarmente partita","location":"BRESCIA","country_iso2":null,"state":null,"city":null,"zip":null,"raw_status":null}]},"destination_info":{"courier_code":null,"courier_phone":null,"weblink":null,"tracking_link":null,"reference_number":null,"milestone_date":{"inforeceived_date":null,"pickup_date":null,"outfordelivery_date":null,"delivery_date":null,"returning_date":null,"returned_date":null},"pickup_date":null,"departed_airport_date":null,"arrived_abroad_date":null,"customs_received_date":null,"trackinfo":[]}}} +HTTP Code: 200 +Error: +Create Response: {"meta":{"code":200,"message":"Request response is successful"},"data":{"id":"9e9652c58e37fc7c8c9b08e9f2eb8f8e","tracking_number":"750000810057432004040056","courier_code":"tnt-it","order_number":"750000810057432004040056","order_date":null,"created_at":"2025-04-03T12:51:49+00:00","update_at":"2025-04-01T09:02:08+00:00","delivery_status":"delivered","archived":"tracking","updating":false,"source":"API","destination_country":"IT","destination_state":"MB","destination_city":"MEDA","origin_country":null,"origin_state":"BS","origin_city":"BRESCIA","tracking_postal_code":null,"tracking_ship_date":null,"tracking_destination_country":null,"tracking_origin_country":null,"tracking_key":null,"tracking_courier_account":null,"customer_name":null,"customer_email":null,"customer_sms":null,"recipient_postcode":null,"order_id":null,"title":null,"logistics_channel":null,"note":null,"label":null,"signed_by":"SIRONI","service_code":"Express","weight":"0,020","weight_kg":null,"product_type":null,"pieces":"1","dimension":"0,001","previously":null,"destination_track_number":null,"exchange_number":null,"scheduled_delivery_date":null,"scheduled_address":null,"substatus":"delivered003","status_info":null,"latest_event":"Spedizione consegnata,COMO,2025-03-25 11:12:00","latest_checkpoint_time":"2025-03-25T11:12:00","transit_time":1,"origin_info":{"courier_code":"tnt-it","courier_phone":"+39 199 803 868","weblink":"http:\/\/www.tnt.it\/","tracking_link":"https:\/\/www.tnt.it\/tracking\/Tracking.do","reference_number":"MY01818480","milestone_date":{"inforeceived_date":null,"pickup_date":"2025-03-24T17:35:00","outfordelivery_date":"2025-03-25T09:31:00","delivery_date":"2025-03-25T11:12:00","returning_date":null,"returned_date":null},"pickup_date":null,"departed_airport_date":null,"arrived_abroad_date":null,"customs_received_date":null,"trackinfo":[{"checkpoint_date":"2025-03-25T11:12:00","checkpoint_delivery_status":"delivered","checkpoint_delivery_substatus":"delivered003","tracking_detail":"Spedizione consegnata","location":"COMO","country_iso2":null,"state":null,"city":null,"zip":null,"raw_status":null},{"checkpoint_date":"2025-03-25T09:31:00","checkpoint_delivery_status":"pickup","checkpoint_delivery_substatus":"pickup001","tracking_detail":"La spedizione e' in consegna in data odierna","location":"COMO","country_iso2":null,"state":null,"city":null,"zip":null,"raw_status":null},{"checkpoint_date":"2025-03-25T01:11:00","checkpoint_delivery_status":"transit","checkpoint_delivery_substatus":"transit001","tracking_detail":"La spedizione e' in transito","location":"COMO","country_iso2":null,"state":null,"city":null,"zip":null,"raw_status":null},{"checkpoint_date":"2025-03-24T17:35:00","checkpoint_delivery_status":"transit","checkpoint_delivery_substatus":"transit001","tracking_detail":"La spedizione e' regolarmente partita","location":"BRESCIA","country_iso2":null,"state":null,"city":null,"zip":null,"raw_status":null}]},"destination_info":{"courier_code":null,"courier_phone":null,"weblink":null,"tracking_link":null,"reference_number":null,"milestone_date":{"inforeceived_date":null,"pickup_date":null,"outfordelivery_date":null,"delivery_date":null,"returning_date":null,"returned_date":null},"pickup_date":null,"departed_airport_date":null,"arrived_abroad_date":null,"customs_received_date":null,"trackinfo":[]}},"success":true,"http_code":200} diff --git a/public/userarea/import_edit.php b/public/userarea/import_edit.php index 41cd30b..24fc5cb 100644 --- a/public/userarea/import_edit.php +++ b/public/userarea/import_edit.php @@ -447,7 +447,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) { text-decoration: none; } - Modifica Dati Importati - <?= htmlspecialchars($titlewebsite, ENT_QUOTES, 'UTF-8'); ?> + Edit Imported Data - <?= htmlspecialchars($titlewebsite, ENT_QUOTES, 'UTF-8'); ?> @@ -513,7 +513,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
-
Salva
+
Save
Photos
fetchAll(PDO::FETCH_ASSOC) as $row) { - + @@ -618,7 +618,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) {
- Data e corriere qui + Shipment Info
@@ -632,7 +632,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) { ×
-

Caricamento...

+

Loading...

@@ -983,7 +983,7 @@ foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $row) { throw new Error(result.message); } - const trackingText = `Data: ${result.deliveryDate}, Firmatario: ${result.signedBy}, Corriere: ${result.carrierName}`; + const trackingText = `Date: ${result.deliveryDate}, Signed by: ${result.signedBy}, Courier: ${result.carrierName}`; trackingResult.textContent = trackingText; trackingHidden.value = JSON.stringify({ deliveryDate: result.deliveryDate, diff --git a/public/userarea/import_xls.php b/public/userarea/import_xls.php index 6eb9a39..6011827 100644 --- a/public/userarea/import_xls.php +++ b/public/userarea/import_xls.php @@ -140,10 +140,10 @@ error_log("Loaded template: " . print_r($template, true));
- +
- +
diff --git a/public/userarea/imported_trf/1-20250403142725-Trial Client 1 TRF - 21.11.2024_CHIARA_SS25_2C PER PELLI - Copia.xlsx b/public/userarea/imported_trf/1-20250403142725-Trial Client 1 TRF - 21.11.2024_CHIARA_SS25_2C PER PELLI - Copia.xlsx new file mode 100644 index 0000000..13738ee Binary files /dev/null and b/public/userarea/imported_trf/1-20250403142725-Trial Client 1 TRF - 21.11.2024_CHIARA_SS25_2C PER PELLI - Copia.xlsx differ diff --git a/public/userarea/imported_trf/1-20250403143010-Trial Client 1 TRF - 21.11.2024_CHIARA_SS25_2C PER PELLI - Copia.xlsx b/public/userarea/imported_trf/1-20250403143010-Trial Client 1 TRF - 21.11.2024_CHIARA_SS25_2C PER PELLI - Copia.xlsx new file mode 100644 index 0000000..6cc4b87 Binary files /dev/null and b/public/userarea/imported_trf/1-20250403143010-Trial Client 1 TRF - 21.11.2024_CHIARA_SS25_2C PER PELLI - Copia.xlsx differ diff --git a/public/userarea/imported_trf/1-20250403145017-Trial Client 1 TRF.xlsx b/public/userarea/imported_trf/1-20250403145017-Trial Client 1 TRF.xlsx new file mode 100644 index 0000000..93a4244 Binary files /dev/null and b/public/userarea/imported_trf/1-20250403145017-Trial Client 1 TRF.xlsx differ diff --git a/public/userarea/include/headscript.php b/public/userarea/include/headscript.php index 74945ed..248df1e 100644 --- a/public/userarea/include/headscript.php +++ b/public/userarea/include/headscript.php @@ -48,6 +48,7 @@ $_SESSION["surnameuser"] = $surnameuser; $_SESSION["emailuser"] = $emailuser; $_SESSION["photouser"] = $avatar; $photouser = $_SESSION["photouser"]; +$photousername = basename($avatar); ?> diff --git a/public/userarea/include/navbar.php b/public/userarea/include/navbar.php index a2c724c..d83b7aa 100644 --- a/public/userarea/include/navbar.php +++ b/public/userarea/include/navbar.php @@ -11,56 +11,76 @@ \ No newline at end of file diff --git a/public/userarea/include/topbar.php b/public/userarea/include/topbar.php index 23f9b94..2779cf5 100644 --- a/public/userarea/include/topbar.php +++ b/public/userarea/include/topbar.php @@ -5,7 +5,7 @@
@@ -15,25 +15,12 @@