diff --git a/front/src/index.ts b/front/src/index.ts index d3a747b..54c2146 100644 --- a/front/src/index.ts +++ b/front/src/index.ts @@ -347,7 +347,7 @@ const refreshPackages = async (response?: Package[]) => { const openButton = detailsBox.querySelector( ".modal-card-foot button.is-primary", )! as HTMLButtonElement; - if (data.status === PackageStatus.READY_TO_PICKUP) { + if (data.status === PackageStatus.READY_TO_PICKUP || data.status === PackageStatus.UNSTACK_FROM_BOX_MACHINE || data.status === PackageStatus.STACK_IN_BOX_MACHINE) { openButton.removeAttribute("disabled"); openButton.onclick = (e: Event) => { e.preventDefault(); diff --git a/front/yarn.lock b/front/yarn.lock index 7515335..9d34e2b 100644 --- a/front/yarn.lock +++ b/front/yarn.lock @@ -1664,9 +1664,9 @@ camelcase@^3.0.0: integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo= caniuse-lite@^1.0.30001135: - version "1.0.30001144" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001144.tgz#bca0fffde12f97e1127a351fec3bfc1971aa3b3d" - integrity sha512-4GQTEWNMnVZVOFG3BK0xvGeaDAtiPAbG2N8yuMXuXzx/c2Vd4XoMPO8+E918zeXn5IF0FRVtGShBfkfQea2wHQ== + version "1.0.30001254" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001254.tgz" + integrity sha512-GxeHOvR0LFMYPmFGA+NiTOt9uwYDxB3h154tW2yBYwfz2EMX3i1IBgr6gmJGfU0K8KQsqPa5XqLD8zVdP5lUzA== chalk@^2.0.0, chalk@^2.3.0: version "2.4.2" diff --git a/webroot/api/collect.shs b/webroot/api/collect.shs index 2774e9a..993eaba 100644 --- a/webroot/api/collect.shs +++ b/webroot/api/collect.shs @@ -10,8 +10,6 @@ while [[ "$data" == '' ]]; do data=$(curl -s -X POST -H "$(get_auth_string)" -H "Content-type: application/json" "https://api-inmobile-pl.easypack24.net/v1/collect/validate" --data '{"geoPoint":{"accuracy":"1","latitude":"'"${post_data[lat]}"'","longitude":"'"${post_data[lon]}"'"},"parcel":{"openCode":"'"${post_data[openCode]}"'","shipmentNumber":"'"${post_data[id]}"'"}}') done -echo $data > tmpdata - if [[ $(echo $data | jq .status) == "403" ]]; then echo $data | jq "{status: .status, msg: .error}" else @@ -25,5 +23,4 @@ else else jq -n '{status: $ARGS.positional[0], msg: $ARGS.positional[1]}' --args -1 "OCW received an invalid response from the API." fi - echo $data > tmp_data2 fi