| @@ -21,9 +21,8 @@ | ||
| 21 | 21 | const settings = getSetting( 'packeta-widget_data' ); |
| 22 | 22 | const { |
| 23 | 23 | carrierConfig, |
| 24 | 24 | translations, |
| 25 | - showLogo, | |
| 26 | 25 | logo, |
| 27 | 26 | widgetAutoOpen, |
| 28 | 27 | adminAjaxUrl, |
| 29 | 28 | } = settings; |
| @@ -157,24 +156,15 @@ | ||
| 157 | 156 | let skipView = false; |
| 158 | 157 | let inputRequired = true; |
| 159 | 158 | |
| 160 | 159 | if ( packetaPickupPointShippingRate ) { |
| 161 | - const buttonPlace = | |
| 162 | - viewState && viewState.pickupPoint.pickupPointType === 'internal' ? viewState.pickupPoint.place : ''; | |
| 163 | - | |
| 164 | - const buttonInfo = viewState && viewState.pickupPoint | |
| 165 | - ? [viewState.pickupPoint.street, `${viewState.pickupPoint.city} ${viewState.pickupPoint.zip}`].filter(Boolean).join(', ') | |
| 166 | - : ''; | |
| 167 | - | |
| 168 | 160 | return { |
| 169 | 161 | buttonCallback: onWidgetButtonClicked, |
| 170 | 162 | buttonLabel: translations.choosePickupPoint, |
| 171 | - buttonPlace: buttonPlace, | |
| 172 | - buttonInfo: buttonInfo, | |
| 163 | + buttonInfo: viewState && viewState.pickupPoint && viewState.pickupPoint.name, | |
| 173 | 164 | inputValue: viewState && viewState.pickupPoint ? viewState.pickupPoint.name : '', |
| 174 | 165 | inputRequired, |
| 175 | 166 | errorMessage: getPickupPointErrorMessage( viewState ), |
| 176 | - showLogo, | |
| 177 | 167 | logo, |
| 178 | 168 | translations, |
| 179 | 169 | loading, |
| 180 | 170 | }; |
| @@ -196,9 +186,8 @@ | ||
| 196 | 186 | buttonInfo: viewState && viewState.deliveryAddressInfo, |
| 197 | 187 | inputValue: viewState && viewState.deliveryAddressInfo ? viewState.deliveryAddressInfo : '', |
| 198 | 188 | inputRequired, |
| 199 | 189 | errorMessage: getHomeDeliveryErrorMessage( viewState, addressValidationSetting ), |
| 200 | - showLogo, | |
| 201 | 190 | logo, |
| 202 | 191 | translations, |
| 203 | 192 | loading, |
| 204 | 193 | }; |
