Obsługa dodatkowych danych teleadresowych

W tym artykule dowiesz się jak zmodyfikować swój szablon, aby obsługiwać w nim dodatkowe dane teleadresowe.

Wskazówka

W tym artykule trzeba będzie wprowadzać zmiany w plikach js i scss. Z tego artykułu dowiesz się jak je kompilować i minifikować.

Szafir

W pliku common/address-form.html wyszukaj frazę {% if addressVisible -%}. Wszystko nad linijką z tą frazą zamień na ten kod:


{% assign emailReadonly = false -%}
{% assign emailRequired = false -%}
{% assign TINTooltipVisible = false -%}

{% if include contains 'retail' or include == 'company' -%}
	{% if include == 'company' -%}
		{% assign chosenType = config.Registration.Company -%}
		{% assign company = true -%}
		{% assign TINVisible = true -%}
		{% assign tin = customer.TIN -%}
		{% assign vateu = customer.VATEU -%}
		{% assign countryISOCode = config.Countries[0].ISOCode -%}
	{% else -%}
		{% assign chosenType = config.Registration.Retail -%}
		{% if include contains '=' -%}
			{% assign includeArr = include | Split:'=' -%}
			{% assign countryISOCode = includeArr[1] -%}
		{% else -%}
			{% assign countryISOCode = config.Countries[0].ISOCode -%}
		{% endif -%}
		{% assign countryChangeReload = true -%}
		{% assign dataContainer = '.sign-up-address-lq' -%}
		{% assign dataInclude = 'retail=' -%}
	{% endif -%}
	{% assign addressVisible = chosenType.AddressVisible -%}
	{% assign addressRequired = chosenType.AddressRequired -%}
	{% assign phoneVisible = chosenType.PhoneVisible -%}
	{% assign phoneRequired = chosenType.PhoneRequired -%}
	{% assign address = customer.Address -%}
{% elseif include contains 'add-da' -%}
	{% if customer.Company -%}
		{% assign company = true -%}
		{% assign TINVisible = false -%}
	{% endif -%}
	{% assign addressVisible = true -%}
	{% assign addressRequired = true -%}
	{% assign phoneVisible = true -%}
	{% assign phoneRequired = true -%}
	{% assign includeArr = include | Split:'=' -%}
	{% assign countryISOCode = includeArr[1] -%}
	{% assign countryChangeReload = true -%}
	{% assign dataContainer = '.add-da-lq' -%}
	{% assign dataInclude = 'add-da=' -%}
{% elseif include == 'orderDa' -%}
	{% if order.Customer.Company -%}
		{% assign company = true -%}
		{% assign TINVisible = false -%}
	{% endif -%}
	{% assign addressVisible = true -%}
	{% assign addressRequired = true -%}
	{% assign phoneVisible = true -%}
	{% assign phoneRequired = order.SelectedDelivery.PhoneRequired -%}
    {% if usr.Authenticated -%}
        {% assign emailReadonly = true -%}
    {% endif -%}
	{% if order != '' -%}
    	{% assign emailRequired = true -%}
    	{% assign email = order.Customer.Email -%}
		{% assign address = order.Customer.DeliveryAddress -%}
	{% elseif customer.DeliveryAddress.Name != '' -%}
		{% assign address = customer.DeliveryAddress -%}
	{% else -%}
		{% assign address = customer.Address -%}
	{% endif -%}
	{% assign countryISOCode = order.Customer.DeliveryAddress.Country -%}
	{% if order.SelectedDelivery.CollectionPointTypeId == 2 -%}
		{% assign showMapTrigger = true -%}
	{% endif -%}
{% elseif include == 'buyerAddress' -%}
	{% if order.Customer.Company -%}
		{% assign company = true -%}
		{% assign TINVisible = false -%}
	{% endif -%}
	{% assign addressVisible = true -%}
	{% assign addressRequired = true -%}
	{% assign phoneVisible = true -%}
	{% assign phoneRequired = order.SelectedDelivery.PhoneRequired -%}
    {% if usr.Authenticated -%}
        {% assign emailReadonly = true -%}
    {% endif -%}
	{% if order != '' -%}
    	{% assign emailRequired = true -%}
    	{% assign email = order.Customer.Email -%}
		{% assign address = order.Customer.Buyer -%}
	{% elseif customer.DeliveryAddress.Name != '' -%}
		{% assign address = customer.DeliveryAddress -%}
	{% else -%}
		{% assign address = customer.Address -%}
	{% endif -%}
	{% assign countryISOCode = order.Customer.DeliveryAddress.Country -%}
	{% if order.SelectedDelivery.CollectionPointTypeId == 2 -%}
		{% assign showMapTrigger = true -%}
	{% endif -%}
{% elseif include contains 'inv-add' or page.QueryString contains 'invoice-address' -%}
	{% if page.QueryString contains 'invoice-address'-%}
		{% if page.QueryString contains 'company' -%}
			{% assign companyCheck = true -%}
		{% endif -%}
	{% else -%}
		{% if order.Customer.Company -%}
			{% assign companyCheck = true -%}
		{% endif -%}
	{% endif -%}
	{% if companyCheck -%}
		{% assign company = true -%}
	{% endif -%}
	{% assign TINVisible = true -%}
	{% if order.Customer.TIN != '' -%}
		{% assign tin = order.Customer.TIN -%}
		{% assign vateu = order.Customer.VATEU -%}
	{% else -%}
		{% assign tin = customer.TIN -%}
		{% assign vateu = customer.VATEU -%}
	{% endif -%}
	{% assign addressVisible = true -%}
	{% assign addressRequired = true -%}
	{% assign phoneVisible = false -%}
	{% assign phoneRequired = false -%}
	{% if order == null -%}
        {% assign address = customer.Address -%}
	{% else -%}
		{% assign address = order.Customer.InvoiceAddress -%}
	{% endif -%}
	{% if include contains 'inv-add=' -%}
		{% assign includeArr = include | Split:'=' -%}
		{% assign countryISOCode = includeArr[1] -%}
		{% assign countryChangeReload = true -%}
		{% assign dataContainer = '.ia-lq' -%}
		{% assign dataInclude = 'inv-add=' -%}
	{% else -%}
		{% if address.Country != '' -%}
			{% assign countryISOCode = address.Country -%}
		{% else -%}
			{% assign countryISOCode = config.DefaultCountry -%}
		{% endif -%}
	{% endif -%}
	{% assign autoPost = true -%}
    {% if usr.Authenticated -%}
        {% assign emailReadonly = true -%}
    {% endif -%}
{% elseif include == 'order-da-popup-ret' -%}
	{% assign TINVisible = false -%}
	{% assign addressVisible = true -%}
	{% assign addressRequired = true -%}
	{% assign phoneVisible = true -%}
	{% assign phoneRequired = order.SelectedDelivery.PhoneRequired -%}
	{% assign emailRequired = true -%}
	{% assign email = order.Customer.Email -%}
	{% if order != '' -%}
		{% assign address = order.Customer.DeliveryAddress -%}
	{% elseif customer.DeliveryAddress.Name != '' -%}
		{% assign address = customer.DeliveryAddress -%}
	{% else -%}
		{% assign address = customer.Address -%}
	{% endif -%}
	{% assign countryISOCode = order.Customer.DeliveryAddress.Country -%}
	{% if order.SelectedDelivery.CollectionPointTypeId == 2 -%}
		{% assign showMapTrigger = true -%}
	{% endif -%}
	{% assign dontShowCountry = true -%}
{% elseif include == 'order-da-popup-comp' -%}
	{% assign company = true -%}
	{% assign TINVisible = false -%}
	{% assign addressVisible = true -%}
	{% assign addressRequired = true -%}
	{% assign phoneVisible = true -%}
	{% assign phoneRequired = order.SelectedDelivery.PhoneRequired -%}
	{% assign emailRequired = true -%}
	{% assign email = order.Customer.Email -%}
	{% if order != '' -%}
		{% assign address = order.Customer.DeliveryAddress -%}
	{% elseif customer.DeliveryAddress.Name != '' -%}
		{% assign address = customer.DeliveryAddress -%}
	{% else -%}
		{% assign address = customer.Address -%}
	{% endif -%}
	{% assign countryISOCode = order.Customer.DeliveryAddress.Country -%}
	{% if order.SelectedDelivery.CollectionPointTypeId == 2 -%}
		{% assign showMapTrigger = true -%}
	{% endif -%}
	{% assign dontShowCountry = true -%}
{% elseif include == 'order-buyer-popup-ret' -%}
	{% assign TINVisible = false -%}
	{% assign addressVisible = true -%}
	{% assign addressRequired = true -%}
	{% assign phoneVisible = true -%}
	{% assign phoneRequired = order.SelectedDelivery.PhoneRequired -%}
	{% assign emailRequired = false -%}
	{% assign email = order.Customer.Email -%}
	{% if order != '' -%}
		{% assign address = order.Customer.Buyer -%}
	{% elseif customer.DeliveryAddress.Name != '' -%}
		{% assign address = customer.DeliveryAddress -%}
	{% else -%}
		{% assign address = customer.Address -%}
	{% endif -%}
	{% assign countryISOCode = order.Customer.DeliveryAddress.Country -%}
	{% if order.SelectedDelivery.CollectionPointTypeId == 2 -%}
		{% assign showMapTrigger = true -%}
	{% endif -%}
	{% assign dontShowCountry = true -%}
{% elseif include == 'order-buyer-popup-comp' -%}
	{% assign company = true -%}
	{% assign TINVisible = false -%}
	{% assign addressVisible = true -%}
	{% assign addressRequired = true -%}
	{% assign phoneVisible = true -%}
	{% assign phoneRequired = order.SelectedDelivery.PhoneRequired -%}
	{% assign emailRequired = false -%}
	{% assign email = order.Customer.Email -%}
	{% if order != '' -%}
		{% assign address = order.Customer.Buyer -%}
	{% elseif customer.DeliveryAddress.Name != '' -%}
		{% assign address = customer.DeliveryAddress -%}
	{% else -%}
		{% assign address = customer.Address -%}
	{% endif -%}
	{% assign countryISOCode = order.Customer.DeliveryAddress.Country -%}
	{% if order.SelectedDelivery.CollectionPointTypeId == 2 -%}
		{% assign showMapTrigger = true -%}
	{% endif -%}
	{% assign dontShowCountry = true -%}
{% elseif include == 'order-invoice-popup-ret' or include contains 'inv-country-ret=' -%}
    {% assign company = false -%}
	{% assign TINVisible = true -%}
	{% assign addressVisible = true -%}
	{% assign addressRequired = true -%}
	{% assign phoneVisible = false -%}
	{% assign phoneRequired = false -%}
	{% if order == null -%}
		{% assign address = customer.Address -%}
	{% else -%}
		{% assign address = order.Customer.InvoiceAddress -%}
	{% endif -%}
    {% assign countryChangeReload = true -%}
    {% assign dataContainer = '.invoice-address-form-in-popup-lq.retail-lq' -%}
    {% assign dataInclude = 'inv-country-ret=' -%}
	{% if include contains 'inv-country-ret=' -%}
		{% assign includeArr = include | Split:'=' -%}
		{% assign countryISOCode = includeArr[1] -%}
	{% else -%}
		{% if address.Country != '' -%}
			{% assign countryISOCode = address.Country -%}
		{% else -%}
			{% assign countryISOCode = config.DefaultCountry -%}
		{% endif -%}
	{% endif -%}
	{% assign autoPost = true -%}
	{% assign recipe = true -%}
	{% assign showRecipe = true -%}
{% elseif include == 'order-invoice-popup-comp' or include contains 'inv-country-comp=' -%}
	{% assign company = true -%}
	{% assign TINVisible = true -%}
	{% if order.Customer.TIN != '' -%}
		{% assign tin = order.Customer.TIN -%}
		{% assign vateu = order.Customer.VATEU -%}
	{% else -%}
		{% assign tin = customer.TIN -%}
		{% assign vateu = customer.VATEU -%}
	{% endif -%}
	{% assign addressVisible = true -%}
	{% assign addressRequired = true -%}
	{% assign phoneVisible = false -%}
	{% assign phoneRequired = false -%}
	{% if order == null -%}
		{% assign address = customer.Address -%}
	{% else -%}
		{% assign address = order.Customer.InvoiceAddress -%}
	{% endif -%}
    {% assign countryChangeReload = true -%}
    {% assign dataContainer = '.invoice-address-form-in-popup-lq.company-lq' -%}
    {% assign dataInclude = 'inv-country-comp=' -%}
	{% if include contains 'inv-country-comp=' -%}
		{% assign includeArr = include | Split:'=' -%}
		{% assign countryISOCode = includeArr[1] -%}
	{% else -%}
		{% if address.Country != '' -%}
			{% assign countryISOCode = address.Country -%}
		{% else -%}
			{% assign countryISOCode = config.DefaultCountry -%}
		{% endif -%}
	{% endif -%}
	{% assign autoPost = true -%}
	{% if countryISOCode == 'PL' and settings.downloadDataFromGUS == 'yes' and settings.editDataFromGUS == 'no' -%}
		{% assign readonly = true -%}
	{% endif -%}
	{% if countryISOCode == 'PL' and settings.downloadDataFromGUS == 'yes' -%}
		{% assign gus = true -%}
	{% endif -%}
	{% assign recipe = true -%}
	{% assign showRecipe = false -%}
{% elseif include contains 'customer-data' -%}
	{% if customer.Company -%}
		{% assign company = true -%}
		{% assign TINVisible = true -%}
		{% assign tin = customer.TIN -%}
		{% assign vateu = customer.VATEU -%}
	{% endif -%}
	{% assign emailRequired = true -%}
	{% assign email = customer.Address.Email -%}
	{% assign addressVisible = true -%}
	{% assign addressRequired = true -%}
	{% assign phoneVisible = true -%}
	{% assign phoneRequired = true -%}
	{% assign address = customer.Address -%}
	{% assign includeArr = include | Split:'=' -%}
	{% assign countryISOCode = includeArr[1] -%}
	{% assign countryChangeReload = true -%}
	{% assign dataContainer = '.customer-data-address-lq' -%}
	{% assign dataInclude = 'customer-data=' -%}
	{% if countryISOCode == 'PL' and settings.downloadDataFromGUS == 'yes' and settings.editDataFromGUS == 'no' and customer.Company -%}
		{% assign readonly = true -%}
	{% endif -%}
	{% if countryISOCode == 'PL' and settings.downloadDataFromGUS == 'yes' -%}
		{% assign gus = true -%}
	{% endif -%}
{% elseif include contains '|' -%}
	{% comment -%}<!--da-->{% endcomment -%}
	{% if customer.Company -%}
		{% assign company = true -%}
		{% assign TINVisible = false -%}
	{% endif -%}
	{% assign addressVisible = true -%}
	{% assign addressRequired = true -%}
	{% assign phoneVisible = true -%}
	{% assign phoneRequired = true -%}
	{% assign incSplit = include | Split:'|' -%}
	{% assign daId = incSplit[0] | ToInt -%}
	{% assign address = customer.DeliveryAddresses[daId] -%}
	{% assign incSplitSize = incSplit | Size -%}
	{% if incSplitSize > 1 -%}
		{% assign countryISOCode = incSplit[1] -%}
	{% endif -%}
	{% assign countryChangeReload = true -%}
	{% assign dataContainer = '.da-lq' -%}
	{% capture dataInclude -%}{{address.Id}}|{% endcapture -%}
{% else -%}
	{% if customer.Company -%}
		{% assign company = true -%}
		{% assign TINVisible = true -%}
		{% assign tin = customer.TIN -%}
		{% assign vateu = customer.VATEU -%}
	{% endif -%} 
	{% assign emailRequired = true -%}
	{% assign email = customer.Address.Email -%}
	{% assign addressVisible = true -%}
	{% assign addressRequired = true -%}
	{% assign phoneVisible = true -%}
	{% assign phoneRequired = true -%}
	{% assign address = customer.Address -%}
	{% assign countryISOCode = config.Countries[0].ISOCode -%}
{% endif -%}

{% assign cityRequired = config.Countries[countryISOCode].RequiredFields.City -%}
{% assign streetRequired = config.Countries[countryISOCode].RequiredFields.Street -%}
{% assign streetNoRequired = config.Countries[countryISOCode].RequiredFields.StreetNo -%}
{% assign zipCodeRequired = config.Countries[countryISOCode].RequiredFields.ZipCode -%}
{% assign TINRequired = config.Countries[countryISOCode].RequiredFields.TIN -%}

{% if include contains 'inv-add' or page.QueryString contains 'invoice-address' -%}
	{% if customer.Company -%}
		{% assign TINRequired = true -%}
	{% else -%}
		{% assign TINRequired = false -%}
	{% endif -%}
{% endif -%}
{% if include == 'order-invoice-popup-ret' or include contains 'inv-country-ret=' -%}
	{% assign TINRequired = false -%}
{% elseif include == 'order-invoice-popup-comp' or include contains 'inv-country-comp=' -%}
	{% assign TINRequired = true -%}
{% endif -%}

100

101

102

103

104

105

106

107

108

109

110

111

112

113

114

115

116

117

118

119

120

121

122

123

124

125

126

127

128

129

130

131

132

133

134

135

136

137

138

139

140

141

142

143

144

145

146

147

148

149

150

151

152

153

154

155

156

157

158

159

160

161

162

163

164

165

166

167

168

169

170

171

172

173

174

175

176

177

178

179

180

181

182

183

184

185

186

187

188

189

190

191

192

193

194

195

196

197

198

199

200

201

202

203

204

205

206

207

208

209

210

211

212

213

214

215

216

217

218

219

220

221

222

223

224

225

226

227

228

229

230

231

232

233

234

235

236

237

238

239

240

241

242

243

244

245

246

247

248

249

250

251

252

253

254

255

256

257

258

259

260

261

262

263

264

265

266

267

268

269

270

271

272

273

274

275

276

277

278

279

280

281

282

283

284

285

286

287

288

289

290

291

292

293

294

295

296

297

298

299

300

301

302

303

304

305

306

307

308

309

310

311

312

313

314

315

316

317

318

319

320

321

322

323

324

325

326

327

328

329

330

331

332

333

334

335

336

337

338

339

340

341

342

343

344

345

346

347

348

349

350

351

352

353

354

355

356

357

358

359

360

361

362

363

364

365

366

367

368

369

370

371

372

{% assign emailReadonly = false -%}

{% assign emailRequired = false -%}

{% assign TINTooltipVisible = false -%}

{% if include contains 'retail' or include == 'company' -%}

{% if include == 'company' -%}

{% assign chosenType = config.Registration.Company -%}

{% assign company = true -%}

{% assign TINVisible = true -%}

{% assign tin = customer.TIN -%}

{% assign vateu = customer.VATEU -%}

{% assign countryISOCode = config.Countries[0].ISOCode -%}

{% else -%}

{% assign chosenType = config.Registration.Retail -%}

{% if include contains '=' -%}

{% assign includeArr = include | Split:'=' -%}

{% assign countryISOCode = includeArr[1] -%}

{% else -%}

{% assign countryISOCode = config.Countries[0].ISOCode -%}

{% endif -%}

{% assign countryChangeReload = true -%}

{% assign dataContainer = '.sign-up-address-lq' -%}

{% assign dataInclude = 'retail=' -%}

{% endif -%}

{% assign addressVisible = chosenType.AddressVisible -%}

{% assign addressRequired = chosenType.AddressRequired -%}

{% assign phoneVisible = chosenType.PhoneVisible -%}

{% assign phoneRequired = chosenType.PhoneRequired -%}

{% assign address = customer.Address -%}

{% elseif include contains 'add-da' -%}

{% if customer.Company -%}

{% assign company = true -%}

{% assign TINVisible = false -%}

{% endif -%}

{% assign addressVisible = true -%}

{% assign addressRequired = true -%}

{% assign phoneVisible = true -%}

{% assign phoneRequired = true -%}

{% assign includeArr = include | Split:'=' -%}

{% assign countryISOCode = includeArr[1] -%}

{% assign countryChangeReload = true -%}

{% assign dataContainer = '.add-da-lq' -%}

{% assign dataInclude = 'add-da=' -%}

{% elseif include == 'orderDa' -%}

{% if order.Customer.Company -%}

{% assign company = true -%}

{% assign TINVisible = false -%}

{% endif -%}

{% assign addressVisible = true -%}

{% assign addressRequired = true -%}

{% assign phoneVisible = true -%}

{% assign phoneRequired = order.SelectedDelivery.PhoneRequired -%}

{% if usr.Authenticated -%}

{% assign emailReadonly = true -%}

{% endif -%}

{% if order != '' -%}

{% assign emailRequired = true -%}

{% assign email = order.Customer.Email -%}

{% assign address = order.Customer.DeliveryAddress -%}

{% elseif customer.DeliveryAddress.Name != '' -%}

{% assign address = customer.DeliveryAddress -%}

{% else -%}

{% assign address = customer.Address -%}

{% endif -%}

{% assign countryISOCode = order.Customer.DeliveryAddress.Country -%}

{% if order.SelectedDelivery.CollectionPointTypeId == 2 -%}

{% assign showMapTrigger = true -%}

{% endif -%}

{% elseif include == 'buyerAddress' -%}

{% if order.Customer.Company -%}

{% assign company = true -%}

{% assign TINVisible = false -%}

{% endif -%}

{% assign addressVisible = true -%}

{% assign addressRequired = true -%}

{% assign phoneVisible = true -%}

{% assign phoneRequired = order.SelectedDelivery.PhoneRequired -%}

{% if usr.Authenticated -%}

{% assign emailReadonly = true -%}

{% endif -%}

{% if order != '' -%}

{% assign emailRequired = true -%}

{% assign email = order.Customer.Email -%}

{% assign address = order.Customer.Buyer -%}

{% elseif customer.DeliveryAddress.Name != '' -%}

{% assign address = customer.DeliveryAddress -%}

{% else -%}

{% assign address = customer.Address -%}

{% endif -%}

{% assign countryISOCode = order.Customer.DeliveryAddress.Country -%}

{% if order.SelectedDelivery.CollectionPointTypeId == 2 -%}

{% assign showMapTrigger = true -%}

{% endif -%}

{% elseif include contains 'inv-add' or page.QueryString contains 'invoice-address' -%}

{% if page.QueryString contains 'invoice-address'-%}

{% if page.QueryString contains 'company' -%}

{% assign companyCheck = true -%}

{% endif -%}

{% else -%}

{% if order.Customer.Company -%}

{% assign companyCheck = true -%}

{% endif -%}

{% if companyCheck -%}

{% assign company = true -%}

{% endif -%}

{% assign TINVisible = true -%}

{% if order.Customer.TIN != '' -%}

{% assign tin = order.Customer.TIN -%}

{% assign vateu = order.Customer.VATEU -%}

{% else -%}

{% assign tin = customer.TIN -%}

{% assign vateu = customer.VATEU -%}

{% endif -%}

{% assign addressVisible = true -%}

{% assign addressRequired = true -%}

{% assign phoneVisible = false -%}

{% assign phoneRequired = false -%}

{% if order == null -%}

{% assign address = customer.Address -%}

{% else -%}

{% assign address = order.Customer.InvoiceAddress -%}

{% endif -%}

{% if include contains 'inv-add=' -%}

{% assign includeArr = include | Split:'=' -%}

{% assign countryISOCode = includeArr[1] -%}

{% assign countryChangeReload = true -%}

{% assign dataContainer = '.ia-lq' -%}

{% assign dataInclude = 'inv-add=' -%}

{% else -%}

{% if address.Country != '' -%}

{% assign countryISOCode = address.Country -%}

{% else -%}

{% assign countryISOCode = config.DefaultCountry -%}

{% endif -%}

{% assign autoPost = true -%}

{% if usr.Authenticated -%}

{% assign emailReadonly = true -%}

{% endif -%}

{% elseif include == 'order-da-popup-ret' -%}

{% assign TINVisible = false -%}

{% assign addressVisible = true -%}

{% assign addressRequired = true -%}

{% assign phoneVisible = true -%}

{% assign phoneRequired = order.SelectedDelivery.PhoneRequired -%}

{% assign emailRequired = true -%}

{% assign email = order.Customer.Email -%}

{% if order != '' -%}

{% assign address = order.Customer.DeliveryAddress -%}

{% elseif customer.DeliveryAddress.Name != '' -%}

{% assign address = customer.DeliveryAddress -%}

{% else -%}

{% assign address = customer.Address -%}

{% endif -%}

{% assign countryISOCode = order.Customer.DeliveryAddress.Country -%}

{% if order.SelectedDelivery.CollectionPointTypeId == 2 -%}

{% assign showMapTrigger = true -%}

{% endif -%}

{% assign dontShowCountry = true -%}

{% elseif include == 'order-da-popup-comp' -%}

{% assign company = true -%}

{% assign TINVisible = false -%}

{% assign addressVisible = true -%}

{% assign addressRequired = true -%}

{% assign phoneVisible = true -%}

{% assign phoneRequired = order.SelectedDelivery.PhoneRequired -%}

{% assign emailRequired = true -%}

{% assign email = order.Customer.Email -%}

{% if order != '' -%}

{% assign address = order.Customer.DeliveryAddress -%}

{% elseif customer.DeliveryAddress.Name != '' -%}

{% assign address = customer.DeliveryAddress -%}

{% else -%}

{% assign address = customer.Address -%}

{% endif -%}

{% assign countryISOCode = order.Customer.DeliveryAddress.Country -%}

{% if order.SelectedDelivery.CollectionPointTypeId == 2 -%}

{% assign showMapTrigger = true -%}

{% endif -%}

{% assign dontShowCountry = true -%}

{% elseif include == 'order-buyer-popup-ret' -%}

{% assign TINVisible = false -%}

{% assign addressVisible = true -%}

{% assign addressRequired = true -%}

{% assign phoneVisible = true -%}

{% assign phoneRequired = order.SelectedDelivery.PhoneRequired -%}

{% assign emailRequired = false -%}

{% assign email = order.Customer.Email -%}

{% if order != '' -%}

{% assign address = order.Customer.Buyer -%}

{% elseif customer.DeliveryAddress.Name != '' -%}

{% assign address = customer.DeliveryAddress -%}

{% else -%}

{% assign address = customer.Address -%}

{% endif -%}

{% assign countryISOCode = order.Customer.DeliveryAddress.Country -%}

{% if order.SelectedDelivery.CollectionPointTypeId == 2 -%}

{% assign showMapTrigger = true -%}

{% endif -%}

{% assign dontShowCountry = true -%}

{% elseif include == 'order-buyer-popup-comp' -%}

{% assign company = true -%}

{% assign TINVisible = false -%}

{% assign addressVisible = true -%}

{% assign addressRequired = true -%}

{% assign phoneVisible = true -%}

{% assign phoneRequired = order.SelectedDelivery.PhoneRequired -%}

{% assign emailRequired = false -%}

{% assign email = order.Customer.Email -%}

{% if order != '' -%}

{% assign address = order.Customer.Buyer -%}

{% elseif customer.DeliveryAddress.Name != '' -%}

{% assign address = customer.DeliveryAddress -%}

{% else -%}

{% assign address = customer.Address -%}

{% endif -%}

{% assign countryISOCode = order.Customer.DeliveryAddress.Country -%}

{% if order.SelectedDelivery.CollectionPointTypeId == 2 -%}

{% assign showMapTrigger = true -%}

{% endif -%}

{% assign dontShowCountry = true -%}

{% elseif include == 'order-invoice-popup-ret' or include contains 'inv-country-ret=' -%}

{% assign company = false -%}

{% assign TINVisible = true -%}

{% assign addressVisible = true -%}

{% assign addressRequired = true -%}

{% assign phoneVisible = false -%}

{% assign phoneRequired = false -%}

{% if order == null -%}

{% assign address = customer.Address -%}

{% else -%}

{% assign address = order.Customer.InvoiceAddress -%}

{% endif -%}

{% assign countryChangeReload = true -%}

{% assign dataContainer = '.invoice-address-form-in-popup-lq.retail-lq' -%}

{% assign dataInclude = 'inv-country-ret=' -%}

{% if include contains 'inv-country-ret=' -%}

{% assign includeArr = include | Split:'=' -%}

{% assign countryISOCode = includeArr[1] -%}

{% else -%}

{% if address.Country != '' -%}

{% assign countryISOCode = address.Country -%}

{% else -%}

{% assign countryISOCode = config.DefaultCountry -%}

{% endif -%}

{% assign autoPost = true -%}

{% assign recipe = true -%}

{% assign showRecipe = true -%}

{% elseif include == 'order-invoice-popup-comp' or include contains 'inv-country-comp=' -%}

{% assign company = true -%}

{% assign TINVisible = true -%}

{% if order.Customer.TIN != '' -%}

{% assign tin = order.Customer.TIN -%}

{% assign vateu = order.Customer.VATEU -%}

{% else -%}

{% assign tin = customer.TIN -%}

{% assign vateu = customer.VATEU -%}

{% endif -%}

{% assign addressVisible = true -%}

{% assign addressRequired = true -%}

{% assign phoneVisible = false -%}

{% assign phoneRequired = false -%}

{% if order == null -%}

{% assign address = customer.Address -%}

{% else -%}

{% assign address = order.Customer.InvoiceAddress -%}

{% endif -%}

{% assign countryChangeReload = true -%}

{% assign dataContainer = '.invoice-address-form-in-popup-lq.company-lq' -%}

{% assign dataInclude = 'inv-country-comp=' -%}

{% if include contains 'inv-country-comp=' -%}

{% assign includeArr = include | Split:'=' -%}

{% assign countryISOCode = includeArr[1] -%}

{% else -%}

{% if address.Country != '' -%}

{% assign countryISOCode = address.Country -%}

{% else -%}

{% assign countryISOCode = config.DefaultCountry -%}

{% endif -%}

{% assign autoPost = true -%}

{% if countryISOCode == 'PL' and settings.downloadDataFromGUS == 'yes' and settings.editDataFromGUS == 'no' -%}

{% assign readonly = true -%}

{% endif -%}

{% if countryISOCode == 'PL' and settings.downloadDataFromGUS == 'yes' -%}

{% assign gus = true -%}

{% endif -%}

{% assign recipe = true -%}

{% assign showRecipe = false -%}

{% elseif include contains 'customer-data' -%}

{% if customer.Company -%}

{% assign company = true -%}

{% assign TINVisible = true -%}

{% assign tin = customer.TIN -%}

{% assign vateu = customer.VATEU -%}

{% endif -%}

{% assign emailRequired = true -%}

{% assign email = customer.Address.Email -%}

{% assign addressVisible = true -%}

{% assign addressRequired = true -%}

{% assign phoneVisible = true -%}

{% assign phoneRequired = true -%}

{% assign address = customer.Address -%}

{% assign includeArr = include | Split:'=' -%}

{% assign countryISOCode = includeArr[1] -%}

{% assign countryChangeReload = true -%}

{% assign dataContainer = '.customer-data-address-lq' -%}

{% assign dataInclude = 'customer-data=' -%}

{% if countryISOCode == 'PL' and settings.downloadDataFromGUS == 'yes' and settings.editDataFromGUS == 'no' and customer.Company -%}

{% assign readonly = true -%}

{% endif -%}

{% if countryISOCode == 'PL' and settings.downloadDataFromGUS == 'yes' -%}

{% assign gus = true -%}

{% endif -%}

{% elseif include contains '|' -%}

{% comment -%}{% endcomment -%}

{% if customer.Company -%}

{% assign company = true -%}

{% assign TINVisible = false -%}

{% endif -%}

{% assign addressVisible = true -%}

{% assign addressRequired = true -%}

{% assign phoneVisible = true -%}

{% assign phoneRequired = true -%}

{% assign incSplit = include | Split:'|' -%}

{% assign daId = incSplit[0] | ToInt -%}

{% assign address = customer.DeliveryAddresses[daId] -%}

{% assign incSplitSize = incSplit | Size -%}

{% if incSplitSize > 1 -%}

{% assign countryISOCode = incSplit[1] -%}

{% endif -%}

{% assign countryChangeReload = true -%}

{% assign dataContainer = '.da-lq' -%}

{% capture dataInclude -%}{{address.Id}}|{% endcapture -%}

{% else -%}

{% if customer.Company -%}

{% assign company = true -%}

{% assign TINVisible = true -%}

{% assign tin = customer.TIN -%}

{% assign vateu = customer.VATEU -%}

{% endif -%}

{% assign emailRequired = true -%}

{% assign email = customer.Address.Email -%}

{% assign addressVisible = true -%}

{% assign addressRequired = true -%}

{% assign phoneVisible = true -%}

{% assign phoneRequired = true -%}

{% assign address = customer.Address -%}

{% assign countryISOCode = config.Countries[0].ISOCode -%}

{% endif -%}

{% assign cityRequired = config.Countries[countryISOCode].RequiredFields.City -%}

{% assign streetRequired = config.Countries[countryISOCode].RequiredFields.Street -%}

{% assign streetNoRequired = config.Countries[countryISOCode].RequiredFields.StreetNo -%}

{% assign zipCodeRequired = config.Countries[countryISOCode].RequiredFields.ZipCode -%}

{% assign TINRequired = config.Countries[countryISOCode].RequiredFields.TIN -%}

{% if include contains 'inv-add' or page.QueryString contains 'invoice-address' -%}

{% if customer.Company -%}

{% assign TINRequired = true -%}

{% else -%}

{% assign TINRequired = false -%}

{% endif -%}

{% if include == 'order-invoice-popup-ret' or include contains 'inv-country-ret=' -%}

{% assign TINRequired = false -%}

{% elseif include == 'order-invoice-popup-comp' or include contains 'inv-country-comp=' -%}

{% assign TINRequired = true -%}

{% endif -%}

Następnie w pliku order/delivery-partials/address-form.html podmień całą jego zawartość na ten kod:


{% assign type = include -%}
{% assign typeForJS = 0 -%}
{% assign areCountries = false -%}
{% assign addressesAmount = customer.DeliveryAddresses | Size -%}

{% comment -%}
{% if addressesAmount ==  1 -%}
    {% if customer.DeliveryAddresses[0].Country == order.Customer.DeliveryAddress.Country -%}
        {% assign areCountries = true -%}
    {% endif -%}
{% endif -%}
{% endcomment -%}

{% if addressesAmount > 1 %}
    {% assign countryCode = config.DefaultCountry -%}
    {% if order.Customer.DeliveryAddress.Country != '' -%}
        {% assign countryCode = order.Customer.DeliveryAddress.Country -%}
    {% endif -%}
    {% for address in customer.DeliveryAddresses -%}
        {% if address.Country == countryCode -%}
            {% assign areCountries = true -%}
            {% break -%}
        {% endif -%}
    {% endfor -%}
{% endif -%}

<div class="form-lq" novalidate>
    {% if type == 'orderDa' -%}
        <input type="hidden" name="__action" value="Order/DeliveryAddressUpdate" />
    {% elseif type == 'inv-add' -%}
        <input type="hidden" name="__action" value="Order/InvoiceAddressUpdate" />
        {% assign typeForJS = 1 -%}
    {% else -%}
        <input type="hidden" name="__action" value="Order/BuyerUpdate" />
        {% assign typeForJS = 2 -%}
    {% endif -%}
    <div class="right-corner-ui">
        {% assign addressesAmount = customer.DeliveryAddresses | Size -%}
        {% if areCountries and order.SelectedDelivery.CollectionPointTypeId == 0 -%}
            {% if type == 'orderDa' or type == 'buyerAddress' -%}
                <button class="btn-pure-ui change-delivery-address-lq">
                    <i class="va-mid-ui ti-exchange-vertical"></i>
                    <span class="va-mid-ui line-height-1-ui">{{translations.ChangeAddress}}</span>
                </button>
            {% endif -%}
        {% endif -%}
        <button class="btn-pure-ui confirm-in-cart-ui confirm-address-lq {% if type == 'orderDa' or type == 'buyerAddress' -%} da-ui {% endif -%} {% if type == 'inv-add' and order.Customer.Company == false -%} inv-ret-ui {% endif -%}" {% if type == 'inv-add' -%} style="margin-top: -58px;" {% endif -%}>
            <i class="va-mid-ui ti-check"></i>
            <span class="va-mid-ui line-height-1-ui">{{translations.Confirm}}</span>
        </button>
    </div>
    {% if type == 'inv-add' -%}
        <input type="hidden" name="company" value="{{ order.Customer.Company }}" />
        <input type="hidden" name="invoice" value="true" />
        {% assign address = order.Customer.InvoiceAddress -%}
        {% if address.Country != '' -%}
            {% assign countryISOCode = address.Country -%}
        {% else -%}
            {% assign countryISOCode = config.DefaultCountry -%}
        {% endif -%}
        {% capture inc -%}inv-add={{countryISOCode}}{% endcapture -%}
        <div class="box-ui form-to-confirm-in-cart-ui ia-lq">
            {% include 'common/address-form.html' with inc -%}
        </div>
    {% else -%}
        <div class="box-ui form-to-confirm-in-cart-ui">
            {% include 'common/address-form.html' with type -%}
        </div>
    {% endif -%}
</div>

{% assign type = include -%}

{% assign typeForJS = 0 -%}

{% assign areCountries = false -%}

{% assign addressesAmount = customer.DeliveryAddresses | Size -%}

{% comment -%}

{% if addressesAmount == 1 -%}

{% if customer.DeliveryAddresses[0].Country == order.Customer.DeliveryAddress.Country -%}

{% assign areCountries = true -%}

{% endif -%}

{% endcomment -%}

{% if addressesAmount > 1 %}

{% assign countryCode = config.DefaultCountry -%}

{% if order.Customer.DeliveryAddress.Country != '' -%}

{% assign countryCode = order.Customer.DeliveryAddress.Country -%}

{% endif -%}

{% for address in customer.DeliveryAddresses -%}

{% if address.Country == countryCode -%}

{% assign areCountries = true -%}

{% break -%}

{% endif -%}

{% endfor -%}

{% endif -%}

{% if type == 'orderDa' -%}

{% elseif type == 'inv-add' -%}

{% assign typeForJS = 1 -%}

{% else -%}

{% assign typeForJS = 2 -%}

{% endif -%}

{% assign addressesAmount = customer.DeliveryAddresses | Size -%}

{% if areCountries and order.SelectedDelivery.CollectionPointTypeId == 0 -%}

{% if type == 'orderDa' or type == 'buyerAddress' -%}

<span class="va-mid-ui line-height-1-ui">{{translations.ChangeAddress}}</span>

</button>

{% endif -%}

<span class="va-mid-ui line-height-1-ui">{{translations.Confirm}}</span>

</button>

</div>

{% if type == 'inv-add' -%}

{% assign address = order.Customer.InvoiceAddress -%}

{% if address.Country != '' -%}

{% assign countryISOCode = address.Country -%}

{% else -%}

{% assign countryISOCode = config.DefaultCountry -%}

{% endif -%}

{% capture inc -%}inv-add={{countryISOCode}}{% endcapture -%}

{% include 'common/address-form.html' with inc -%}

</div>

{% else -%}

{% include 'common/address-form.html' with type -%}

</div>

{% endif -%}

</div>

Teraz w pliku order/delivery-partials/address-list-item.html znajdź frazę {{address.State}}. Linijkę z tą frazą zastąp poniższym kodem:


<span data-name="state">{{address.State}}</span> <span data-name="countryCode">{{address.Country}}</span>

<span data-name="state">{{address.State}}</span> <span data-name="countryCode">{{address.Country}}</span>

Następnie w pliku w pliku order/delivery-partials/address-presentation.html całą zawartość pliku zastąp tym kodem:


{% assign type = include -%}

{% if type == 'orderDa' -%}
    {% if deliveryAddress -%}
        {% assign address = deliveryAddress -%}
    {% else -%}
        {% assign address = order.Customer.DeliveryAddress -%}
    {% endif -%}
{% elseif type == 'inv-add' -%}
    {% if invoiceAddress -%}
        {% assign address = invoiceAddress -%}
    {% else -%}
        {% assign address = order.Customer.InvoiceAddress -%}
    {% endif -%}
{% elseif type == 'buyerAddress' -%}
    {% if buyerAddress -%}
        {% assign address = buyerAddress -%}
    {% else -%}
        {% assign address = order.Customer.Buyer -%}
    {% endif -%}
{% endif -%} 

{% assign areCountries = false -%}
{% assign addressesAmount = customer.DeliveryAddresses | Size -%}

{% comment -%}
{% if addressesAmount ==  1 -%}
    {% if customer.DeliveryAddresses[0].Country != order.Customer.DeliveryAddress.Country -%}
        {% assign areCountries = true -%}
    {% endif -%}
{% endif -%}
{% endcomment -%}

{% if addressesAmount > 1 %}
    {% assign countryCode = config.DefaultCountry -%}
    {% if order.Customer.DeliveryAddress.Country != '' -%}
        {% assign countryCode = order.Customer.DeliveryAddress.Country -%}
    {% endif -%}
    {% for address in customer.DeliveryAddresses -%}
        {% if address.Country == countryCode -%}
            {% assign areCountries = true -%}
            {% break -%}
        {% endif -%}
    {% endfor -%}
{% endif -%}

{% if settings.blockAddingAndEditingDeliveryAddress == 'no' -%}
    {% assign canEditOrAddDeliveryAddress = true -%}
{% elseif settings.blockAddingAndEditingDeliveryAddressFor == 'withLimits' and customer.CreditLimit == null -%}
    {% assign canEditOrAddDeliveryAddress = true -%}
{% else -%}
    {% assign canEditOrAddDeliveryAddress = false -%}
{% endif -%}
{% if settings.blockCompanyDataEdition == 'no' -%}
    {% assign canEditCustomerDetails = true -%}
{% elseif settings.blockCompanyDataEditionFor == 'withLimits' and customer.CreditLimit == null -%}
    {% assign canEditCustomerDetails = true -%}
{% else -%}
    {% assign canEditCustomerDetails = false -%}
{% endif -%}
{% assign canEditDA = false -%}
{% assign canEditCD = false -%}
{% assign canEditAnything = false -%}
{% assign cantEditSomething = false -%}
{% if canEditOrAddDeliveryAddress and type == 'orderDa' -%}
    {% assign canEditDA = true -%}
{% endif -%}
{% if canEditCustomerDetails and type == 'inv-add' -%}
    {% assign canEditCD = true -%}
{% endif -%}
{% if canEditDA or canEditCD -%}
    {% assign canEditAnything = true -%}
{% endif -%}
{% if canEditDA == false or canEditCD == false -%}
    {% assign cantEditSomething = true -%}
{% endif -%}


<div class="right-corner-ui">
    {% if type == 'orderDa' or type == 'buyerAddress' -%}
        {% if areCountries and order.SelectedDelivery.CollectionPointTypeId == 0 and usr.Authenticated -%}
            <button class="btn-pure-ui change-delivery-address-lq">
                <i class="va-mid-ui ti-exchange-vertical"></i>
                <span class="va-mid-ui line-height-1-ui">{{translations.ChangeAddress}}</span>
            </button>
        {% endif -%}
    {% endif -%}
    {% unless type == 'inv-add' and order.Customer.CustomerDetailsEditable == false -%}
        <button class="btn-pure-ui other-address-ui {% if order.Customer.Company and canEditAnything == false and type == 'orderDa' -%} address-edition-blocked-trigger-lq {% else -%} other-address-lq {% endif -%}" {% if type == 'inv-add' -%} style="margin-top: -58px;" {% endif -%}>
            <i class="va-mid-ui ti-pencil"></i>
            <span class="va-mid-ui line-height-1-ui">{{translations.OtherAddress}}</span>
        </button>
    {% endunless -%}
</div>

{% assign noBorder = false -%}
{% if settings.buyerData == "yes" %}
    {% if type == 'orderDa' or type == 'buyerAddress' %}
        {% assign noBorder = true -%}
    {% endif -%}
{% endif -%}

<div class="box-ui clear-after-ui {% if order.Customer.Company and cantEditSomething -%} address-edition-blocked-trigger-lq {% endif -%}" {% if noBorder %} style="border-top: none;"{% endif -%}>
    <div>
        <p>
            <strong>{{address.Name}}</strong>
        </p>

        {% if address.Name2 != '' %}
            <small>{{address.Name2}}</small>
        {% endif -%}

        <p>
            {{address.Street}}
            {{address.StreetNo}}{% if address.UnitNo != ''-%}/{{address.UnitNo}}{% endif -%}
        </p>
         
        <p>
            {{address.ZipCode}} {{address.City}}
        </p>

        <p>
            {{address.State}} {{address.Country}}
        </p>

        {% if type == 'inv-add' and order.Customer.TIN != '' -%}
            <strong>{{translations.TIN}} </strong>
            <span>
                {% if config.ENTERPRISE and order.Customer.VATEU != '' -%}
                    {{order.Customer.VATEU}}
                {% endif -%}

                {{order.Customer.TIN}}
            </span>
        {% endif %}
    </div>

    {% if type == 'orderDa' or type == 'buyerAddress' -%}
        <div class="f-left-ui mt10-ui">
            <i class="va-mid-ui ti-email"></i>
            <span class="va-mid-ui line-height-1-ui">
                {{order.Customer.Email}}
            </span>
        </div>

        {% if address.PhoneNo != '' -%}
            <div class="f-right-ui mt10-ui">
                <i class="va-mid-ui ti-headphone-alt"></i>
                <span class="va-mid-ui line-height-1-ui">
                    {{address.PhoneNo}}
                </span>
            </div>
        {% endif -%}

        <div class="form-lq">
            <input type="hidden" name="zipCode" value="{{address.ZipCode}}" {% if order.SelectedDelivery.CollectionPointTypeId == 2 -%} class="show-map-lq" {% endif -%} />
        </div>
    {% endif %}
</div>

100

101

102

103

104

105

106

107

108

109

110

111

112

113

114

115

116

117

118

119

120

121

122

123

124

125

126

127

128

129

130

131

132

133

134

135

136

137

138

139

140

141

142

143

144

145

146

147

148

149

150

151

152

153

154

155

156

157

158

159

160

{% assign type = include -%}

{% if type == 'orderDa' -%}

{% if deliveryAddress -%}

{% assign address = deliveryAddress -%}

{% else -%}

{% assign address = order.Customer.DeliveryAddress -%}

{% endif -%}

{% elseif type == 'inv-add' -%}

{% if invoiceAddress -%}

{% assign address = invoiceAddress -%}

{% else -%}

{% assign address = order.Customer.InvoiceAddress -%}

{% endif -%}

{% elseif type == 'buyerAddress' -%}

{% if buyerAddress -%}

{% assign address = buyerAddress -%}

{% else -%}

{% assign address = order.Customer.Buyer -%}

{% endif -%}

{% assign areCountries = false -%}

{% assign addressesAmount = customer.DeliveryAddresses | Size -%}

{% comment -%}

{% if addressesAmount == 1 -%}

{% if customer.DeliveryAddresses[0].Country != order.Customer.DeliveryAddress.Country -%}

{% assign areCountries = true -%}

{% endif -%}

{% endcomment -%}

{% if addressesAmount > 1 %}

{% assign countryCode = config.DefaultCountry -%}

{% if order.Customer.DeliveryAddress.Country != '' -%}

{% assign countryCode = order.Customer.DeliveryAddress.Country -%}

{% endif -%}

{% for address in customer.DeliveryAddresses -%}

{% if address.Country == countryCode -%}

{% assign areCountries = true -%}

{% break -%}

{% endif -%}

{% endfor -%}

{% endif -%}

{% if settings.blockAddingAndEditingDeliveryAddress == 'no' -%}

{% assign canEditOrAddDeliveryAddress = true -%}

{% elseif settings.blockAddingAndEditingDeliveryAddressFor == 'withLimits' and customer.CreditLimit == null -%}

{% assign canEditOrAddDeliveryAddress = true -%}

{% else -%}

{% assign canEditOrAddDeliveryAddress = false -%}

{% endif -%}

{% if settings.blockCompanyDataEdition == 'no' -%}

{% assign canEditCustomerDetails = true -%}

{% elseif settings.blockCompanyDataEditionFor == 'withLimits' and customer.CreditLimit == null -%}

{% assign canEditCustomerDetails = true -%}

{% else -%}

{% assign canEditCustomerDetails = false -%}

{% endif -%}

{% assign canEditDA = false -%}

{% assign canEditCD = false -%}

{% assign canEditAnything = false -%}

{% assign cantEditSomething = false -%}

{% if canEditOrAddDeliveryAddress and type == 'orderDa' -%}

{% assign canEditDA = true -%}

{% endif -%}

{% if canEditCustomerDetails and type == 'inv-add' -%}

{% assign canEditCD = true -%}

{% endif -%}

{% if canEditDA or canEditCD -%}

{% assign canEditAnything = true -%}

{% endif -%}

{% if canEditDA == false or canEditCD == false -%}

{% assign cantEditSomething = true -%}

{% endif -%}

{% if type == 'orderDa' or type == 'buyerAddress' -%}

{% if areCountries and order.SelectedDelivery.CollectionPointTypeId == 0 and usr.Authenticated -%}

<span class="va-mid-ui line-height-1-ui">{{translations.ChangeAddress}}</span>

</button>

{% endif -%}

{% unless type == 'inv-add' and order.Customer.CustomerDetailsEditable == false -%}

<span class="va-mid-ui line-height-1-ui">{{translations.OtherAddress}}</span>

</button>

{% endunless -%}

</div>

{% assign noBorder = false -%}

{% if settings.buyerData == "yes" %}

{% if type == 'orderDa' or type == 'buyerAddress' %}

{% assign noBorder = true -%}

{% endif -%}

<div>

<p>

<strong>{{address.Name}}</strong>

</p>

{% if address.Name2 != '' %}

<small>{{address.Name2}}</small>

{% endif -%}

<p>

{{address.StreetNo}}{% if address.UnitNo != ''-%}/{{address.UnitNo}}{% endif -%}

</p>

<p>

</p>

<p>

</p>

{% if type == 'inv-add' and order.Customer.TIN != '' -%}

<strong>{{translations.TIN}} </strong>

<span>

{% if config.ENTERPRISE and order.Customer.VATEU != '' -%}

{% endif -%}

</span>

{% endif %}

</div>

{% if type == 'orderDa' or type == 'buyerAddress' -%}

</span>

</div>

{% if address.PhoneNo != '' -%}

</span>

</div>

{% endif -%}

</div>

{% endif %}

</div>

Teraz w pliku order/delivery-partials/delivery-section.html znajdź frazę {% assign index = 0 -%}. Wszystko nad linijką z tą frazą zastąp poniższym kodem:


{% assign deliveryAddress = order.Customer.DeliveryAddress -%}
{% assign invoiceAddress = order.Customer.InvoiceAddress -%}
{% assign buyerAddress = order.Customer.Buyer -%}

{% if customer-profile != null -%}
    {% assign deliveryAddress = customer-profile.Order.DeliveryAddress -%}
    {% assign invoiceAddress = customer-profile.Order.InvoiceAddress -%}
    {% assign buyerAddress = customer-profile.Order.Customer.Buyer -%}
{% endif -%}

{% assign deliveryAddress = order.Customer.DeliveryAddress -%}

{% assign invoiceAddress = order.Customer.InvoiceAddress -%}

{% assign buyerAddress = order.Customer.Buyer -%}

{% if customer-profile != null -%}

{% assign deliveryAddress = customer-profile.Order.DeliveryAddress -%}

{% assign invoiceAddress = customer-profile.Order.InvoiceAddress -%}

{% assign buyerAddress = customer-profile.Order.Customer.Buyer -%}

{% endif -%}

Dalej w pliku order/delivery-partials/delivery-section.html znajdź frazę delivery-address-lq. W podmień kod w tym divie na te poniżej:


			{% if settings.buyerData == "yes" %}
				{% if order.Customer.Buyer == null -%}
					<script>
						$.post('', {__action: 'Order/BuyerChange', buyer: true, __csrf: __CSRF});
					</script>
				{% endif -%}
				<div class="clear-after-ui">
					<div class="order-address-data-tab-ui order-address-data-tab-lq left-ui active-lq">
						{% if order.SelectedDelivery.CollectionPointTypeId == 0 -%}
							{{translations.ShippingAddress}}
						{% else -%}
							{{translations.MyData}}
						{% endif -%}
					</div>
					<div class="order-address-data-tab-ui order-address-data-tab-lq right-ui">{{translations.BuyerData}}</div>
				</div>
			{% else %}
				<p>
					{% if order.SelectedDelivery.CollectionPointTypeId == 0 -%}
						{{translations.ShippingAddress}}
					{% else -%}
						{{translations.MyData}}
					{% endif -%}
				</p>
			{% endif %}
			<div class="address-template-container-lq delivery-lq" data-address-type="0">
				{% assign lackOfPhone = false -%}
				{% assign countryMismatch = false -%}

				{% if order.SelectedDelivery.PhoneRequired and deliveryAddress.PhoneNo == '' -%}
					{% assign lackOfPhone = true -%}
				{% endif -%}

				{% if page.Cookies.delivCountryChanged == 'true' -%}
					{% assign countryMismatch = true -%}
				{% endif -%}

				{% if deliveryAddress.Name == '' or lackOfPhone or countryMismatch -%}
					{% assign showForm = true -%}
				{% endif -%}

				{% if showForm -%}
					{% if order.Customer.Company and canEditOrAddDeliveryAddress == false -%}
						{% include 'order/delivery-partials/address-presentation.html' with 'orderDa' -%}
					{% else -%}
						{% include 'order/delivery-partials/address-form.html' with 'orderDa' -%}
					{% endif -%}
				{% else -%}
					{% include 'order/delivery-partials/address-presentation.html' with 'orderDa' -%}
				{% endif -%}
			</div>
			<div class="address-template-container-lq buyer-lq hidden-lq" data-address-type="2">
				{% if buyerAddress.Name == ''  -%}
					{% assign showForm = true -%}
				{% endif -%}

				{% if showForm -%}
					{% include 'order/delivery-partials/address-form.html' with 'buyerAddress' -%}
				{% else -%}
					{% include 'order/delivery-partials/address-presentation.html' with 'buyerAddress' -%}
				{% endif -%}
			</div>

{% if settings.buyerData == "yes" %}

{% if order.Customer.Buyer == null -%}

$.post('', {__action: 'Order/BuyerChange', buyer: true, __csrf: __CSRF});

</script>

{% endif -%}

{% if order.SelectedDelivery.CollectionPointTypeId == 0 -%}

{% else -%}

{% endif -%}

</div>

<div class="order-address-data-tab-ui order-address-data-tab-lq right-ui">{{translations.BuyerData}}</div>

</div>

{% else %}

<p>

{% if order.SelectedDelivery.CollectionPointTypeId == 0 -%}

{% else -%}

{% endif -%}

</p>

{% endif %}

{% assign lackOfPhone = false -%}

{% assign countryMismatch = false -%}

{% if order.SelectedDelivery.PhoneRequired and deliveryAddress.PhoneNo == '' -%}

{% assign lackOfPhone = true -%}

{% endif -%}

{% if page.Cookies.delivCountryChanged == 'true' -%}

{% assign countryMismatch = true -%}

{% endif -%}

{% if deliveryAddress.Name == '' or lackOfPhone or countryMismatch -%}

{% assign showForm = true -%}

{% endif -%}

{% if showForm -%}

{% if order.Customer.Company and canEditOrAddDeliveryAddress == false -%}

{% include 'order/delivery-partials/address-presentation.html' with 'orderDa' -%}

{% else -%}

{% include 'order/delivery-partials/address-form.html' with 'orderDa' -%}

{% endif -%}

{% else -%}

{% include 'order/delivery-partials/address-presentation.html' with 'orderDa' -%}

{% endif -%}

</div>

{% if buyerAddress.Name == '' -%}

{% assign showForm = true -%}

{% endif -%}

{% if showForm -%}

{% include 'order/delivery-partials/address-form.html' with 'buyerAddress' -%}

{% else -%}

{% include 'order/delivery-partials/address-presentation.html' with 'buyerAddress' -%}

{% endif -%}

</div>

Następnie w pliku order/cart.html znajdź frazę forms-container-ui forms-container-lq. Zamień wszystko w tym divie na ten kod:


<div class="delivery-address-form-in-popup-container-ui delivery-address-form-in-popup-container-lq">
                                                                                    <div class="form-title-ui {% if settings.buyerData == 'yes' %} not-authenticated-ui {% endif %}">
                                                                                        {% if settings.buyerData == "yes" %}
                                                                                            {% if order.Customer.Buyer == null -%}
                                                                                                <script>
                                                                                                    $.post('', {__action: 'Order/BuyerChange', buyer: true, __csrf: __CSRF});
                                                                                                </script>
                                                                                            {% endif -%}
                                                                                            <div class="clear-after-ui">
                                                                                                <div class="order-address-data-tab-ui order-address-data-tab-not-authenticated-lq not-authenticated-ui left-ui active-lq">
                                                                                                    {{ translations.DeliveryData }}
                                                                                                </div>
                                                                                                <div class="order-address-data-tab-ui order-address-data-tab-not-authenticated-lq not-authenticated-ui right-ui">
                                                                                                    {{ translations.BuyerData }}
                                                                                                </div>
                                                                                            </div>
                                                                                        {% else %}
                                                                                            {{ translations.DeliveryData }}
                                                                                        {% endif %}
                                                                                    </div>
                                                                                    {% if config.CompanyOnly == false -%}
                                                                                        <div class="form-lq delivery-address-form-in-popup-ui delivery-address-form-in-popup-lq retail-lq {% if settings.defaultSignUp == 'company' -%} hidden-lq {% endif -%}">
                                                                                            {% include 'common/address-form.html' with 'order-da-popup-ret' -%}
                                                                                        </div>
                                                                                        <div class="form-lq delivery-address-form-in-popup-ui buyer-address-form-in-popup-lq retail-lq hidden-lq">
                                                                                            {% include 'common/address-form.html' with 'order-buyer-popup-ret' -%}
                                                                                        </div>
                                                                                    {% endif -%}
                                                                                    <div class="form-lq delivery-address-form-in-popup-ui delivery-address-form-in-popup-lq company-lq {% if settings.defaultSignUp == 'retail' and config.CompanyOnly == false -%} hidden-lq {% endif -%}">
                                                                                        {% include 'common/address-form.html' with 'order-da-popup-comp' -%}
                                                                                    </div>
                                                                                    <div class="form-lq delivery-address-form-in-popup-ui buyer-address-form-in-popup-lq company-lq hidden-lq">
                                                                                        {% include 'common/address-form.html' with 'order-buyer-popup-comp' -%}
                                                                                    </div>
                                                                                </div>
                                                                                <div class="invoice-address-form-in-popup-container-ui invoice-address-form-in-popup-container-lq">
                                                                                    <div class="form-title-ui form-title-lq invoice-title-lq {% if settings.defaultSignUp == 'retail' -%} hidden-lq {% endif -%}">{{ translations.InvoiceData }}</div>
                                                                                    <div class="form-title-ui form-title-lq recipe-title-lq {% if settings.defaultSignUp == 'company' -%} hidden-lq {% endif -%}">{{ translations.RecipeData }}</div>
                                                                                    <label class="radio-ui" style="margin-top: 17px;">
                                                                                        <input aria-label="toggle-recipe-and-invoice" type="radio" name="toggle-recipe-and-invoice" value="recipe" {% if settings.defaultSignUp == 'retail' -%} checked {% endif -%}>
                                                                                        <span class="label-ui"></span>
                                                                                        <span>{{ translations.WantToGetRecipe }}</span>
                                                                                    </label>
                                                                                    <label class="radio-ui">
                                                                                        <input aria-label="toggle-recipe-and-invoice" type="radio" name="toggle-recipe-and-invoice" value="invoice" {% if settings.defaultSignUp == 'company' -%} checked {% endif -%}>
                                                                                        <span class="label-ui"></span>
                                                                                        <span>{{ translations.WantToGetInvoice }}</span>
                                                                                    </label>
                                                                                    {% if config.CompanyOnly == false -%}
                                                                                        <div class="form-lq invoice-address-form-in-popup-ui invoice-address-form-in-popup-lq retail-lq {% if settings.defaultSignUp == 'company' -%} hidden-lq {% endif -%}">
                                                                                            {% include 'common/address-form.html' with 'order-invoice-popup-ret' -%}
                                                                                        </div>
                                                                                    {% endif -%}
                                                                                    <div class="form-lq invoice-address-form-in-popup-ui invoice-address-form-in-popup-lq company-lq {% if settings.defaultSignUp == 'retail' and config.CompanyOnly == false -%} hidden-lq {% endif -%} {% if config.DefaultCountry == 'PL' and settings.downloadDataFromGUS == 'yes' -%} with-gus-lq {% endif -%}">
                                                                                        {% include 'common/address-form.html' with 'order-invoice-popup-comp' -%}
                                                                                    </div>
                                                                                </div>
                                                                                <button  aria-label="save-delivery-data"  class="btn-ui save-delivery-data-popup-ui save-delivery-data-popup-lq">{{ translations.SaveData }}</button>

{% if settings.buyerData == "yes" %}

{% if order.Customer.Buyer == null -%}

$.post('', {__action: 'Order/BuyerChange', buyer: true, __csrf: __CSRF});

</script>

{% endif -%}

</div>

</div>

{% else %}

{% endif %}

</div>

{% if config.CompanyOnly == false -%}

{% include 'common/address-form.html' with 'order-da-popup-ret' -%}

</div>

{% include 'common/address-form.html' with 'order-buyer-popup-ret' -%}

</div>

{% endif -%}

{% include 'common/address-form.html' with 'order-da-popup-comp' -%}

</div>

{% include 'common/address-form.html' with 'order-buyer-popup-comp' -%}

</div>

<div class="form-title-ui form-title-lq invoice-title-lq {% if settings.defaultSignUp == 'retail' -%} hidden-lq {% endif -%}">{{ translations.InvoiceData }}</div>

<div class="form-title-ui form-title-lq recipe-title-lq {% if settings.defaultSignUp == 'company' -%} hidden-lq {% endif -%}">{{ translations.RecipeData }}</div>

<span>{{ translations.WantToGetRecipe }}</span>

</label>

<span>{{ translations.WantToGetInvoice }}</span>

</label>

{% if config.CompanyOnly == false -%}

{% include 'common/address-form.html' with 'order-invoice-popup-ret' -%}

</div>

{% endif -%}

{% include 'common/address-form.html' with 'order-invoice-popup-comp' -%}

</div>

<button aria-label="save-delivery-data" class="btn-ui save-delivery-data-popup-ui save-delivery-data-popup-lq">{{ translations.SaveData }}</button>

Teraz w pliku __settings.liquid dodaj analogicznie do pozostałych kolejną sekcję field:


<fieldset>
	<legend>{{buyerData}}</legend>

	<section>
		<h3 class="section-title">{{buyerDataInfo}}</h3>

		<div class="table">
			<div class="trow">
				<div class="tcell">
					<input type="radio" name="buyerData" value="yes" id="buyerData-yes" {% if settings.buyerData == "yes" %} checked {% endif %}/>
					<label class="label" for="buyerData-yes">{{yesTranslation}}</label>
				</div>

				<div class="tcell">
					<input type="radio" name="buyerData" value="no" id="buyerData-no" {% if settings.buyerData == "no" %} checked {% endif %}/>
					<label class="label" for="buyerData-no">{{noTranslation}}</label>
				</div>
			</div>
		</div>
	</section>
</fieldset>

<legend>{{buyerData}}</legend>

<h3 class="section-title">{{buyerDataInfo}}</h3>

<label class="label" for="buyerData-yes">{{yesTranslation}}</label>

</div>

<label class="label" for="buyerData-no">{{noTranslation}}</label>

</div>

</section>

</fieldset>

Teraz w pliku js/init-ui1.js znajdź frazę function Order(configObj) {. Linijkę niżej dodaj poniższy kod:


this.buyerAddressReplaceableSelector = configObj.buyerAddressReplaceableSelector;
this.buyerAddressTemplateInclude = configObj.buyerAddressTemplateInclude;
this.buyerAddresFilled = ($(configObj.buyerAddressReplaceableSelector + ' [name="name"]').length == 0) ? true : false;

this.buyerAddressReplaceableSelector = configObj.buyerAddressReplaceableSelector;

this.buyerAddressTemplateInclude = configObj.buyerAddressTemplateInclude;

this.buyerAddresFilled = ($(configObj.buyerAddressReplaceableSelector + ' [name="name"]').length == 0) ? true : false;

Dalej w pliku js/init-ui1.js znajdź frazę this.confirmAddress. Całą zawartość znalezionej funkcji podmień poniższym kodem:


if (addressType == 0) {
                    var container = $(this.deliveryAddressReplaceableSelector);
                } else if (addressType == 1){
                    var container = $(this.invoiceAddressReplaceableSelector);
                } else {
                    var container = $(this.buyerAddressReplaceableSelector);
                }
                var isValid = window.app.validationBeforePost(e) == '' ? true : false;

                if (isValid) {
                    var form = container.find('.form-lq');
                    var data = form.find('input:not([disabled]), select:not([disabled]), textarea:not([disabled])').serializeArray();

                    if (!errorClass) {
                        var errorClass = '';
                    }

                    if (addressType === 0) {
                        data.push({ name: '__include', value: "'"+this.deliveryAddressTemplateInclude+"'" });
                    } else if (addressType === 1) {
                        data.push({ name: '__include', value: "'"+this.invoiceAddressTemplateInclude+"'" });
                    } else {
                        data.push({ name: '__include', value: "'"+this.buyerAddressTemplateInclude+"'" });
                    }

                    if (templateUrl) {
                        data.push({ name: '__template', value: templateUrl });
                    }

                    data.push({ name: '__csrf', value: __CSRF });

                    var thisRef = this;
                    var confirmPromise;
                    var confirmResponseFunc = function (res) {
                        if (res.action.Result) {
                            app.setCookie('delivCountryChanged', 'true', -1);
                            if (res.template) {
                                container.html(res.template);
                            }

                            if (addressType == 0) {
                                // thisRef.deliveryAddressId = -1;
                                // window.app.setCookie('deliveryAddressId', -1);
                                thisRef.deliveryAddresFilled = true;
                            } else if (addressType == 1) {
                                thisRef.invoiceAddresFilled = true;
                            } else {
                                thisRef.buyerAddresFilled = true;
                            }

                            if (!thisRef.deliveryAddresFilled || (thisRef.isInvoice && !thisRef.invoiceAddresFilled)) {
                                thisRef.orderValidator.removeClass(thisRef.hiddingClass);
                            } else {
                                thisRef.orderValidator.addClass(thisRef.hiddingClass);
                            }
                        } else {
                            form.find('input:not([type="hidden"]), select, textarea').each(function() { window.app.validation(null, $(this)) });
                        }
                    };

                    if (addressType == 0 || addressType == 2) {
                        confirmPromise = $.post('', data, function (res) { confirmResponseFunc(res) });
                    } else {
                        confirmPromise = thisRef.selectInvoice(form)
                            .then($.post('', data, function (res) { confirmResponseFunc(res) }));
                    }

                    if (callback) {
                        confirmPromise.then(function () { callback(isValid) });
                    }

                    return confirmPromise;
                } else {
                    if (callback) {
                        callback(isValid);
                    }
                    return null;
                }

if (addressType == 0) {

var container = $(this.deliveryAddressReplaceableSelector);

} else if (addressType == 1){

var container = $(this.invoiceAddressReplaceableSelector);

} else {

var container = $(this.buyerAddressReplaceableSelector);

}

var isValid = window.app.validationBeforePost(e) == '' ? true : false;

if (isValid) {

var form = container.find('.form-lq');

var data = form.find('input:not([disabled]), select:not([disabled]), textarea:not([disabled])').serializeArray();

if (!errorClass) {

var errorClass = '';

}

if (addressType === 0) {

data.push({ name: '__include', value: "'"+this.deliveryAddressTemplateInclude+"'" });

} else if (addressType === 1) {

data.push({ name: '__include', value: "'"+this.invoiceAddressTemplateInclude+"'" });

} else {

data.push({ name: '__include', value: "'"+this.buyerAddressTemplateInclude+"'" });

}

if (templateUrl) {

data.push({ name: '__template', value: templateUrl });

}

data.push({ name: '__csrf', value: __CSRF });

var thisRef = this;

var confirmPromise;

var confirmResponseFunc = function (res) {

if (res.action.Result) {

app.setCookie('delivCountryChanged', 'true', -1);

if (res.template) {

container.html(res.template);

}

if (addressType == 0) {

// thisRef.deliveryAddressId = -1;

// window.app.setCookie('deliveryAddressId', -1);

thisRef.deliveryAddresFilled = true;

} else if (addressType == 1) {

thisRef.invoiceAddresFilled = true;

} else {

thisRef.buyerAddresFilled = true;

}

if (!thisRef.deliveryAddresFilled || (thisRef.isInvoice && !thisRef.invoiceAddresFilled)) {

thisRef.orderValidator.removeClass(thisRef.hiddingClass);

} else {

thisRef.orderValidator.addClass(thisRef.hiddingClass);

}

} else {

form.find('input:not([type="hidden"]), select, textarea').each(function() { window.app.validation(null, $(this)) });

}

};

if (addressType == 0 || addressType == 2) {

confirmPromise = $.post('', data, function (res) { confirmResponseFunc(res) });

} else {

confirmPromise = thisRef.selectInvoice(form)

.then($.post('', data, function (res) { confirmResponseFunc(res) }));

}

if (callback) {

confirmPromise.then(function () { callback(isValid) });

}

return confirmPromise;

} else {

if (callback) {

callback(isValid);

}

return null;

}

Następnie nadal w pliku js/init-ui1.js znajdź frazę Order/DeliveryAddressUpdate. Linijkę z tą frazą zamień na poniższy kod:


if($('.order-address-data-tab-lq + .order-address-data-tab-lq').hasClass('active-lq')){
                        data['__action'] = 'Order/BuyerUpdate';
                    } else {
                        data['__action'] = 'Order/DeliveryAddressUpdate';
                    }

if($('.order-address-data-tab-lq + .order-address-data-tab-lq').hasClass('active-lq')){

data['__action'] = 'Order/BuyerUpdate';

} else {

data['__action'] = 'Order/DeliveryAddressUpdate';

}

Dalej w pliku js/init-ui1.js znajdź frazę //ORDER’s binding. Wszystko pod tym komentarzem aż do komentarza //confirm address zamień na poniższy kod:


window.order = new Order(
            {
                deliveryAddressReplaceableSelector: '.delivery-address-lq .address-template-container-lq.delivery-lq',
                deliveryAddressTemplateInclude: 'orderDa',
                invoiceAddressReplaceableSelector: '.invoice-address-lq .address-template-container-lq',
                invoiceAddressTemplateInclude: 'inv-add',
                buyerAddressReplaceableSelector: '.delivery-address-lq .address-template-container-lq.buyer-lq',
                buyerAddressTemplateInclude: 'buyerAddress',
                collectionPointType: $('[data-type]').data('type'),
                collectionPointFormSelector: '#ifMapContainer',
                noteReplaceableSelector: '.note-lq',
                headerAttributesSetFormSelector: '.header-attributes-set-form-lq',
                positionAttributesSetSelector: '.products-table-lq',
                addingOrderFormSelector: '.adding-order-form-lq',
                needRecalculateClass: 'need-recalculate-lq',
                orderValidatorSelector: '.order-validation-lq',
                hiddingClass: 'hidden-lq'
            }
        );

        $(document).ajaxSuccess(function(a, b, c, d) {
            setTimeout(function () {
                if(d && d.template != null) {
                    window.order = new Order(
                        {
                            deliveryAddressReplaceableSelector: '.delivery-address-lq .address-template-container-lq.delivery-lq',
                            deliveryAddressTemplateInclude: 'orderDa',
                            invoiceAddressReplaceableSelector: '.invoice-address-lq .address-template-container-lq',
                            invoiceAddressTemplateInclude: 'inv-add',
                            buyerAddressReplaceableSelector: '.delivery-address-lq .address-template-container-lq.buyer-lq',
                            buyerAddressTemplateInclude: 'buyerAddress',
                            collectionPointType: $('[data-type]').data('type'),
                            collectionPointFormSelector: '#ifMapContainer',
                            noteReplaceableSelector: '.note-lq',
                            headerAttributesSetFormSelector: '.header-attributes-set-form-lq',
                            positionAttributesSetSelector: '.products-table-lq',
                            addingOrderFormSelector: '.adding-order-form-lq',
                            needRecalculateClass: 'need-recalculate-lq',
                            orderValidatorSelector: '.order-validation-lq',
                            hiddingClass: 'hidden-lq'
                        }
                    );
                }
            }, 1);
        });

        // //hide doubled delivery methods
        // order.hideDoubbledMethods($('.delivery-method-lq'), $('[data-products-total-value]').data('products-total-value'));

        if($('.products-table-lq').index() != -1){
            var productsTable = $('.products-table-lq');
            window.UIFeatures.attachElement('.products-table-header-lq', null, productsTable.offset().top + productsTable.height());
        }

        //add coupon
        body.on('click', '.add-coupon-lq', function (e) {
            window.order.addCoupon(e);
        })

        //update delivery and payment matrix
        body.on('change', '.change-delivery-lq', function (e) {
            window.order.updateDeliveryMatrix(this, '.delivery-form-lq', '.collection-points-lq', e);
        });

        //redraw points after update if needed
        body.on('deliveryChange', function (e, pointType) {
            if (pointType == 1) {
                $('[data-type]').data('type', pointType).attr('data-type', pointType);
                if(window.google) {
                    app.getCollectionPoints();
                }
            }
        });

        //change address template (from presentation to edition)
        body.on('click', '.other-address-lq', function () {
            var container = $(this).parents('.address-template-container-lq');
            var addressType = $(this).parents('.address-template-container-lq').data('address-type');
            if(addressType == 0){
                var templateInclude = 'orderDa';
            } else if(addressType == 1){
                var templateInclude = 'inv-add';
            } else {
                var templateInclude = 'buyerAddress';
            }
            window.order.replacePartialTemplate(container, 'order/delivery-partials/address-form.html', templateInclude);
        });

        //change address presentation template to addresses list
        body.on('click', '.change-delivery-address-lq', function (e) {
            var container = $(this).parents('.address-template-container-lq');
            window.order.replacePartialTemplate(container, 'order/delivery-partials/addresses-list.html', 'orderDa');
        });

        //change address list to single address presentation
        body.on('click', '.back-to-presentation-lq', function (e) {
            var container = $(this).parents('.address-template-container-lq');
            if($('.order-address-data-tab-lq + .order-address-data-tab-lq').hasClass('active-lq')){
                var include = 'buyerAddress';
            } else {
                var include = 'orderDa';
            }
            window.order.replacePartialTemplate(container, 'order/delivery-partials/address-presentation.html', include);
        });

100

101

102

103

104

105

window.order = new Order(

{

deliveryAddressReplaceableSelector: '.delivery-address-lq .address-template-container-lq.delivery-lq',

deliveryAddressTemplateInclude: 'orderDa',

invoiceAddressReplaceableSelector: '.invoice-address-lq .address-template-container-lq',

invoiceAddressTemplateInclude: 'inv-add',

buyerAddressReplaceableSelector: '.delivery-address-lq .address-template-container-lq.buyer-lq',

buyerAddressTemplateInclude: 'buyerAddress',

collectionPointType: $('[data-type]').data('type'),

collectionPointFormSelector: '#ifMapContainer',

noteReplaceableSelector: '.note-lq',

headerAttributesSetFormSelector: '.header-attributes-set-form-lq',

positionAttributesSetSelector: '.products-table-lq',

addingOrderFormSelector: '.adding-order-form-lq',

needRecalculateClass: 'need-recalculate-lq',

orderValidatorSelector: '.order-validation-lq',

hiddingClass: 'hidden-lq'

}

);

$(document).ajaxSuccess(function(a, b, c, d) {

setTimeout(function () {

if(d && d.template != null) {

window.order = new Order(

{

deliveryAddressReplaceableSelector: '.delivery-address-lq .address-template-container-lq.delivery-lq',

deliveryAddressTemplateInclude: 'orderDa',

invoiceAddressReplaceableSelector: '.invoice-address-lq .address-template-container-lq',

invoiceAddressTemplateInclude: 'inv-add',

buyerAddressReplaceableSelector: '.delivery-address-lq .address-template-container-lq.buyer-lq',

buyerAddressTemplateInclude: 'buyerAddress',

collectionPointType: $('[data-type]').data('type'),

collectionPointFormSelector: '#ifMapContainer',

noteReplaceableSelector: '.note-lq',

headerAttributesSetFormSelector: '.header-attributes-set-form-lq',

positionAttributesSetSelector: '.products-table-lq',

addingOrderFormSelector: '.adding-order-form-lq',

needRecalculateClass: 'need-recalculate-lq',

orderValidatorSelector: '.order-validation-lq',

hiddingClass: 'hidden-lq'

}

);

}

}, 1);

});

// //hide doubled delivery methods

// order.hideDoubbledMethods($('.delivery-method-lq'), $('[data-products-total-value]').data('products-total-value'));

if($('.products-table-lq').index() != -1){

var productsTable = $('.products-table-lq');

window.UIFeatures.attachElement('.products-table-header-lq', null, productsTable.offset().top + productsTable.height());

}

//add coupon

body.on('click', '.add-coupon-lq', function (e) {

window.order.addCoupon(e);

})

//update delivery and payment matrix

body.on('change', '.change-delivery-lq', function (e) {

window.order.updateDeliveryMatrix(this, '.delivery-form-lq', '.collection-points-lq', e);

});

//redraw points after update if needed

body.on('deliveryChange', function (e, pointType) {

if (pointType == 1) {

$('[data-type]').data('type', pointType).attr('data-type', pointType);

if(window.google) {

app.getCollectionPoints();

}

});

//change address template (from presentation to edition)

body.on('click', '.other-address-lq', function () {

var container = $(this).parents('.address-template-container-lq');

var addressType = $(this).parents('.address-template-container-lq').data('address-type');

if(addressType == 0){

var templateInclude = 'orderDa';

} else if(addressType == 1){

var templateInclude = 'inv-add';

} else {

var templateInclude = 'buyerAddress';

}

window.order.replacePartialTemplate(container, 'order/delivery-partials/address-form.html', templateInclude);

});

//change address presentation template to addresses list

body.on('click', '.change-delivery-address-lq', function (e) {

var container = $(this).parents('.address-template-container-lq');

window.order.replacePartialTemplate(container, 'order/delivery-partials/addresses-list.html', 'orderDa');

});

//change address list to single address presentation

body.on('click', '.back-to-presentation-lq', function (e) {

var container = $(this).parents('.address-template-container-lq');

if($('.order-address-data-tab-lq + .order-address-data-tab-lq').hasClass('active-lq')){

var include = 'buyerAddress';

} else {

var include = 'orderDa';

}

window.order.replacePartialTemplate(container, 'order/delivery-partials/address-presentation.html', include);

});

Teraz w pliku js/init-ui1.js dodaj kod:


function toggleOrderAddress(e) {
    $('.order-address-data-tab-lq').toggleClass('active-lq');
    $(e.currentTarget).parents('.delivery-address-lq').find('.address-template-container-lq').toggleClass('hidden-lq');
};

$('body').on('click', '.order-address-data-tab-lq:not(.active-lq)', function (e) {
    toggleOrderAddress(e);
});

function toggleOrderAddressNotAuthenticated(e) {
    $('.order-address-data-tab-not-authenticated-lq').toggleClass('active-lq');
    if($('.order-delivery-data-popup-radio-lq[value=true]').prop('checked')){
        $('.buyer-address-form-in-popup-lq.company-lq').toggleClass('hidden-lq');
        $('.delivery-address-form-in-popup-lq.company-lq').toggleClass('hidden-lq');
    } else {
        $('.buyer-address-form-in-popup-lq.retail-lq').toggleClass('hidden-lq');
        $('.delivery-address-form-in-popup-lq.retail-lq').toggleClass('hidden-lq');
    }
};

$('body').on('click', '.order-address-data-tab-not-authenticated-lq:not(.active-lq)', function (e) {
    toggleOrderAddressNotAuthenticated(e);
});

function toggleOrderAddress(e) {

$('.order-address-data-tab-lq').toggleClass('active-lq');

$(e.currentTarget).parents('.delivery-address-lq').find('.address-template-container-lq').toggleClass('hidden-lq');

};

$('body').on('click', '.order-address-data-tab-lq:not(.active-lq)', function (e) {

toggleOrderAddress(e);

});

function toggleOrderAddressNotAuthenticated(e) {

$('.order-address-data-tab-not-authenticated-lq').toggleClass('active-lq');

if($('.order-delivery-data-popup-radio-lq[value=true]').prop('checked')){

$('.buyer-address-form-in-popup-lq.company-lq').toggleClass('hidden-lq');

$('.delivery-address-form-in-popup-lq.company-lq').toggleClass('hidden-lq');

} else {

$('.buyer-address-form-in-popup-lq.retail-lq').toggleClass('hidden-lq');

$('.delivery-address-form-in-popup-lq.retail-lq').toggleClass('hidden-lq');

}

};

$('body').on('click', '.order-address-data-tab-not-authenticated-lq:not(.active-lq)', function (e) {

toggleOrderAddressNotAuthenticated(e);

});

Następnie w pliku js/init-ui2.js znajdź frazę saveDeliveryDataPopup(e) {. Podmień kod tej funkcji na ten:


if($('.order-address-data-tab-not-authenticated-lq').length > 0){
        var buyerOn = true;
    } else {
        var buyerOn = false;
    }
    var company = $('.order-delivery-data-popup-radio-lq:checked').val();
    if(company == 'true'){
        var DAform = $('.delivery-address-form-in-popup-lq.company-lq');
        if(buyerOn){
            var buyerForm = $('.buyer-address-form-in-popup-lq.company-lq');
        }
    } else {
        var DAform = $('.delivery-address-form-in-popup-lq.retail-lq');
        if(buyerOn){
            var buyerForm = $('.buyer-address-form-in-popup-lq.retail-lq');
        }
    }
    var DAdata = DAform.find('input:not([disabled]), select:not([disabled]), textarea:not([disabled])').serializeArray();
    DAdata.push({ name: '__csrf', value: __CSRF });
    DAdata.push({ name: '__action', value: 'Order/DeliveryAddressUpdate' });
    if(buyerOn){
        var buyerData = buyerForm.find('input:not([disabled]), select:not([disabled]), textarea:not([disabled])').serializeArray();
        buyerData.push({ name: '__csrf', value: __CSRF });
        buyerData.push({ name: '__action', value: 'Order/BuyerUpdate' });
        buyerData.push({ name: '__template', value: 'order/order-template.html' });
    } else {
        DAdata.push({ name: '__template', value: 'order/order-template.html' });
    }
    if(company == 'true'){
        var invoiceForm = $('.invoice-address-form-in-popup-lq.company-lq .form-lq:not(.hidden-lq)');
    } else {
        var invoiceForm = $('.invoice-address-form-in-popup-lq.retail-lq .form-lq:not(.hidden-lq)');
    }
    if(invoiceForm.hasClass('invoice-lq')){
        var invoiceData = invoiceForm.find('input:not([disabled]), select:not([disabled]), textarea:not([disabled])').serializeArray();
        invoiceData.push({ name: '__csrf', value: __CSRF });
        invoiceData.push({ name: '__action', value: 'Order/InvoiceAddressUpdate' });
        invoiceData.push({ name: '__collection', value: 'order.SelectedDelivery.PhoneRequired' });
        invoiceData.push({ name: 'company', value: company });
        invoiceData.push({ name: 'invoice', value: 'true' });
    }
    if((buyerOn && (app.validationBeforePost(e, buyerForm) != 'error' || (app.validationBeforePost(e, buyerForm) == 'error' && buyerForm.find('[name=name]').val() == ''))) || !buyerOn){
        var buyerValidation = true;
    } else {
        var buyerValidation = false;
    }
    if(app.validationBeforePost(e, DAform) != 'error' && app.validationBeforePost(e, invoiceForm) != 'error' && buyerValidation){
        $.post('', invoiceData).then(function (result) {
            if(result.collection){
                var phone = DAform.find('[name=phoneNo]');
                phone.prop('required',true);
                var error = phone.data('error');
                phone.parent().append('<div class="error-ui validation-info-lq validation-required-lq hidden-lq">'+error+'</div>');
                phone.parent().find('label').append(' <span class="required-ui">*</span>');
            }
            $.post('', DAdata, function (result) {
                if(buyerOn){
                    $.post('', buyerData, function (result) {
                        $('.order-template-lq').html(result.template);
                        $('.during-ajax-modal-lq').addClass('hidden-lq');
                        $('body').removeClass('modal-open-ui');
                    });
                } else {
                    $('.order-template-lq').html(result.template);
                    $('.during-ajax-modal-lq').addClass('hidden-lq');
                    $('body').removeClass('modal-open-ui');
                }
            });
        });
    } else if(app.validationBeforePost(e, DAform) == 'error' && buyerOn){
        $(e.currentTarget).find('.order-address-data-tab-not-authenticated-lq').eq(0).trigger('click');
    } else if(!buyerValidation){
        $(e.currentTarget).find('.order-address-data-tab-not-authenticated-lq').eq(1).trigger('click');
    }

if($('.order-address-data-tab-not-authenticated-lq').length > 0){

var buyerOn = true;

} else {

var buyerOn = false;

}

var company = $('.order-delivery-data-popup-radio-lq:checked').val();

if(company == 'true'){

var DAform = $('.delivery-address-form-in-popup-lq.company-lq');

if(buyerOn){

var buyerForm = $('.buyer-address-form-in-popup-lq.company-lq');

}

} else {

var DAform = $('.delivery-address-form-in-popup-lq.retail-lq');

if(buyerOn){

var buyerForm = $('.buyer-address-form-in-popup-lq.retail-lq');

}

var DAdata = DAform.find('input:not([disabled]), select:not([disabled]), textarea:not([disabled])').serializeArray();

DAdata.push({ name: '__csrf', value: __CSRF });

DAdata.push({ name: '__action', value: 'Order/DeliveryAddressUpdate' });

if(buyerOn){

var buyerData = buyerForm.find('input:not([disabled]), select:not([disabled]), textarea:not([disabled])').serializeArray();

buyerData.push({ name: '__csrf', value: __CSRF });

buyerData.push({ name: '__action', value: 'Order/BuyerUpdate' });

buyerData.push({ name: '__template', value: 'order/order-template.html' });

} else {

DAdata.push({ name: '__template', value: 'order/order-template.html' });

}

if(company == 'true'){

var invoiceForm = $('.invoice-address-form-in-popup-lq.company-lq .form-lq:not(.hidden-lq)');

} else {

var invoiceForm = $('.invoice-address-form-in-popup-lq.retail-lq .form-lq:not(.hidden-lq)');

}

if(invoiceForm.hasClass('invoice-lq')){

var invoiceData = invoiceForm.find('input:not([disabled]), select:not([disabled]), textarea:not([disabled])').serializeArray();

invoiceData.push({ name: '__csrf', value: __CSRF });

invoiceData.push({ name: '__action', value: 'Order/InvoiceAddressUpdate' });

invoiceData.push({ name: '__collection', value: 'order.SelectedDelivery.PhoneRequired' });

invoiceData.push({ name: 'company', value: company });

invoiceData.push({ name: 'invoice', value: 'true' });

}

if((buyerOn && (app.validationBeforePost(e, buyerForm) != 'error' || (app.validationBeforePost(e, buyerForm) == 'error' && buyerForm.find('[name=name]').val() == ''))) || !buyerOn){

var buyerValidation = true;

} else {

var buyerValidation = false;

}

if(app.validationBeforePost(e, DAform) != 'error' && app.validationBeforePost(e, invoiceForm) != 'error' && buyerValidation){

$.post('', invoiceData).then(function (result) {

if(result.collection){

var phone = DAform.find('[name=phoneNo]');

phone.prop('required',true);

var error = phone.data('error');

phone.parent().append('<div class="error-ui validation-info-lq validation-required-lq hidden-lq">'+error+'</div>');

phone.parent().find('label').append(' <span class="required-ui">*</span>');

}

$.post('', DAdata, function (result) {

if(buyerOn){

$.post('', buyerData, function (result) {

$('.order-template-lq').html(result.template);

$('.during-ajax-modal-lq').addClass('hidden-lq');

$('body').removeClass('modal-open-ui');

});

} else {

$('.order-template-lq').html(result.template);

$('.during-ajax-modal-lq').addClass('hidden-lq');

$('body').removeClass('modal-open-ui');

}

});

} else if(app.validationBeforePost(e, DAform) == 'error' && buyerOn){

$(e.currentTarget).find('.order-address-data-tab-not-authenticated-lq').eq(0).trigger('click');

} else if(!buyerValidation){

$(e.currentTarget).find('.order-address-data-tab-not-authenticated-lq').eq(1).trigger('click');

}

Dalej w pliku js/init-ui2.js znajdź frazę setOrderDeliveryDataPopupRadio(e) {. Podmień kod tej funkcji na ten:


var company = $(e.currentTarget).val();
    if(company == 'true'){
        if($('.order-address-data-tab-not-authenticated-lq').eq(1).hasClass('active-lq')){
            $('.delivery-address-form-in-popup-lq.company-lq').addClass('hidden-lq');
            $('.buyer-address-form-in-popup-lq.company-lq').removeClass('hidden-lq');
        } else {
            $('.delivery-address-form-in-popup-lq.company-lq').removeClass('hidden-lq');
            $('.buyer-address-form-in-popup-lq.company-lq').addClass('hidden-lq');
        }
        $('.delivery-address-form-in-popup-lq.retail-lq').addClass('hidden-lq');
        $('.buyer-address-form-in-popup-lq.retail-lq').addClass('hidden-lq');
        $('.invoice-address-form-in-popup-lq.retail-lq').addClass('hidden-lq');
        $('.invoice-address-form-in-popup-lq.company-lq').removeClass('hidden-lq');
        $('[name=toggle-recipe-and-invoice][value=invoice]').prop('checked', true).trigger('change');
    } else {
        if($('.order-address-data-tab-not-authenticated-lq').eq(1).hasClass('active-lq')){
            $('.delivery-address-form-in-popup-lq.retail-lq').addClass('hidden-lq');
            $('.buyer-address-form-in-popup-lq.retail-lq').removeClass('hidden-lq');
        } else {
            $('.delivery-address-form-in-popup-lq.retail-lq').removeClass('hidden-lq');
            $('.buyer-address-form-in-popup-lq.retail-lq').addClass('hidden-lq');
        }
        $('.delivery-address-form-in-popup-lq.company-lq').addClass('hidden-lq');
        $('.buyer-address-form-in-popup-lq.company-lq').addClass('hidden-lq');
        $('.invoice-address-form-in-popup-lq.company-lq').addClass('hidden-lq');
        $('.invoice-address-form-in-popup-lq.retail-lq').removeClass('hidden-lq');
        $('[name=toggle-recipe-and-invoice][value=recipe]').prop('checked', true).trigger('change');
    }

var company = $(e.currentTarget).val();

if(company == 'true'){

if($('.order-address-data-tab-not-authenticated-lq').eq(1).hasClass('active-lq')){

$('.delivery-address-form-in-popup-lq.company-lq').addClass('hidden-lq');

$('.buyer-address-form-in-popup-lq.company-lq').removeClass('hidden-lq');

} else {

$('.delivery-address-form-in-popup-lq.company-lq').removeClass('hidden-lq');

$('.buyer-address-form-in-popup-lq.company-lq').addClass('hidden-lq');

}

$('.delivery-address-form-in-popup-lq.retail-lq').addClass('hidden-lq');

$('.buyer-address-form-in-popup-lq.retail-lq').addClass('hidden-lq');

$('.invoice-address-form-in-popup-lq.retail-lq').addClass('hidden-lq');

$('.invoice-address-form-in-popup-lq.company-lq').removeClass('hidden-lq');

$('[name=toggle-recipe-and-invoice][value=invoice]').prop('checked', true).trigger('change');

} else {

if($('.order-address-data-tab-not-authenticated-lq').eq(1).hasClass('active-lq')){

$('.delivery-address-form-in-popup-lq.retail-lq').addClass('hidden-lq');

$('.buyer-address-form-in-popup-lq.retail-lq').removeClass('hidden-lq');

} else {

$('.delivery-address-form-in-popup-lq.retail-lq').removeClass('hidden-lq');

$('.buyer-address-form-in-popup-lq.retail-lq').addClass('hidden-lq');

}

$('.delivery-address-form-in-popup-lq.company-lq').addClass('hidden-lq');

$('.buyer-address-form-in-popup-lq.company-lq').addClass('hidden-lq');

$('.invoice-address-form-in-popup-lq.company-lq').addClass('hidden-lq');

$('.invoice-address-form-in-popup-lq.retail-lq').removeClass('hidden-lq');

$('[name=toggle-recipe-and-invoice][value=recipe]').prop('checked', true).trigger('change');

}

Teraz w pliku scss/globals/_globals2.scss dodaj kod:


.order-address-data-tab-ui{
  width: 50%;
  line-height: 1;
  margin-top: 28px;
  padding: 10px;
  border: 1px solid $lightBorderColor;
  border-bottom: none;
  text-align: center;
  background: $lightBorderColor;
  cursor: pointer;
  &.left-ui{
    float: left;
  }
  &.right-ui{
    float: right;
  }
  &.active-lq{
    font-weight: 700;
    background: #fff;
    cursor: default;
  }
  &.not-authenticated-ui{
    line-height: 1.5em;
    margin-top: 0;
  }
}
.order-ui .not-authenticated-in-order-container-ui .form-title-ui.not-authenticated-ui{
  margin-top: -10px;
  margin-bottom: 27px;
  padding: 0;
}

.order-address-data-tab-ui{

width: 50%;

line-height: 1;

margin-top: 28px;

padding: 10px;

border: 1px solid $lightBorderColor;

border-bottom: none;

text-align: center;

background: $lightBorderColor;

cursor: pointer;

&.left-ui{

float: left;

}

&.right-ui{

float: right;

}

&.active-lq{

font-weight: 700;

background: #fff;

cursor: default;

}

&.not-authenticated-ui{

line-height: 1.5em;

margin-top: 0;

}

.order-ui .not-authenticated-in-order-container-ui .form-title-ui.not-authenticated-ui{

margin-top: -10px;

margin-bottom: 27px;

padding: 0;

}

Obsługa dodatkowych danych teleadresowych

Obsługa dodatkowych danych teleadresowych

Szafir

Czy ten artykuł był pomocny?

Społeczność Comarch

Oferta e-Commerce

Przydatne linki

Kontakt