@@ -178,7 +178,6 @@ pub struct LineItem {
178
178
quantity : Option < u16 > ,
179
179
}
180
180
181
-
182
181
#[ serde_with:: skip_serializing_none]
183
182
#[ derive( Clone , Default , Debug , Serialize , Deserialize ) ]
184
183
#[ serde( rename_all = "camelCase" ) ]
@@ -284,7 +283,6 @@ pub struct AdyenPaymentRequest<'a> {
284
283
country_code : Option < enums:: CountryAlpha2 > ,
285
284
line_items : Option < Vec < LineItem > > ,
286
285
channel : Option < Channel > ,
287
- metadata : Option < common_utils:: pii:: SecretSerdeValue > ,
288
286
merchant_order_reference : Option < String > ,
289
287
splits : Option < Vec < AdyenSplitData > > ,
290
288
store : Option < String > ,
@@ -2840,6 +2838,8 @@ impl
2840
2838
. clone ( )
2841
2839
. and_then ( |metadata| get_device_fingerprint ( metadata) ) ;
2842
2840
2841
+ let billing_address =
2842
+ get_address_info ( item. router_data . get_optional_billing ( ) ) . and_then ( Result :: ok) ;
2843
2843
let delivery_address =
2844
2844
get_address_info ( item. router_data . get_optional_shipping ( ) ) . and_then ( Result :: ok) ;
2845
2845
let telephone_number = item. router_data . get_optional_billing_phone_number ( ) ;
@@ -2860,7 +2860,7 @@ impl
2860
2860
shopper_email : None ,
2861
2861
shopper_locale : None ,
2862
2862
social_security_number : None ,
2863
- billing_address : None ,
2863
+ billing_address,
2864
2864
delivery_address,
2865
2865
country_code : None ,
2866
2866
line_items : None ,
@@ -2869,7 +2869,6 @@ impl
2869
2869
channel : None ,
2870
2870
shopper_statement : item. router_data . request . statement_descriptor . clone ( ) ,
2871
2871
shopper_ip : item. router_data . request . get_ip_address_as_optional ( ) ,
2872
- metadata : item. router_data . request . metadata . clone ( ) . map ( Into :: into) ,
2873
2872
merchant_order_reference : item. router_data . request . merchant_order_reference_id . clone ( ) ,
2874
2873
store,
2875
2874
splits,
@@ -2948,7 +2947,6 @@ impl TryFrom<(&AdyenRouterData<&PaymentsAuthorizeRouterData>, &Card)> for AdyenP
2948
2947
channel : None ,
2949
2948
shopper_statement : item. router_data . request . statement_descriptor . clone ( ) ,
2950
2949
shopper_ip : item. router_data . request . get_ip_address_as_optional ( ) ,
2951
- metadata : item. router_data . request . metadata . clone ( ) . map ( Into :: into) ,
2952
2950
merchant_order_reference : item. router_data . request . merchant_order_reference_id . clone ( ) ,
2953
2951
store,
2954
2952
splits,
@@ -2999,6 +2997,8 @@ impl
2999
2997
. clone ( )
3000
2998
. and_then ( |metadata| get_device_fingerprint ( metadata) ) ;
3001
2999
3000
+ let billing_address =
3001
+ get_address_info ( item. router_data . get_optional_billing ( ) ) . and_then ( Result :: ok) ;
3002
3002
let delivery_address =
3003
3003
get_address_info ( item. router_data . get_optional_shipping ( ) ) . and_then ( Result :: ok) ;
3004
3004
let telephone_number = item. router_data . get_optional_billing_phone_number ( ) ;
@@ -3019,7 +3019,7 @@ impl
3019
3019
shopper_email : item. router_data . get_optional_billing_email ( ) ,
3020
3020
social_security_number : None ,
3021
3021
telephone_number,
3022
- billing_address : None ,
3022
+ billing_address,
3023
3023
delivery_address,
3024
3024
country_code,
3025
3025
line_items : None ,
@@ -3028,7 +3028,6 @@ impl
3028
3028
channel : None ,
3029
3029
shopper_statement : item. router_data . request . statement_descriptor . clone ( ) ,
3030
3030
shopper_ip : item. router_data . request . get_ip_address_as_optional ( ) ,
3031
- metadata : item. router_data . request . metadata . clone ( ) . map ( Into :: into) ,
3032
3031
merchant_order_reference : item. router_data . request . merchant_order_reference_id . clone ( ) ,
3033
3032
store,
3034
3033
splits,
@@ -3104,7 +3103,6 @@ impl TryFrom<(&AdyenRouterData<&PaymentsAuthorizeRouterData>, &VoucherData)>
3104
3103
channel : None ,
3105
3104
shopper_statement : item. router_data . request . statement_descriptor . clone ( ) ,
3106
3105
shopper_ip : item. router_data . request . get_ip_address_as_optional ( ) ,
3107
- metadata : item. router_data . request . metadata . clone ( ) . map ( Into :: into) ,
3108
3106
merchant_order_reference : item. router_data . request . merchant_order_reference_id . clone ( ) ,
3109
3107
store,
3110
3108
splits,
@@ -3150,7 +3148,8 @@ impl
3150
3148
. metadata
3151
3149
. clone ( )
3152
3150
. and_then ( |metadata| get_device_fingerprint ( metadata) ) ;
3153
-
3151
+ let billing_address =
3152
+ get_address_info ( item. router_data . get_optional_billing ( ) ) . and_then ( Result :: ok) ;
3154
3153
let delivery_address =
3155
3154
get_address_info ( item. router_data . get_optional_shipping ( ) ) . and_then ( Result :: ok) ;
3156
3155
let telephone_number = item. router_data . get_optional_billing_phone_number ( ) ;
@@ -3171,7 +3170,7 @@ impl
3171
3170
shopper_email : item. router_data . get_optional_billing_email ( ) ,
3172
3171
social_security_number : None ,
3173
3172
telephone_number,
3174
- billing_address : None ,
3173
+ billing_address,
3175
3174
delivery_address,
3176
3175
country_code : None ,
3177
3176
line_items : None ,
@@ -3180,7 +3179,6 @@ impl
3180
3179
channel : None ,
3181
3180
shopper_statement : item. router_data . request . statement_descriptor . clone ( ) ,
3182
3181
shopper_ip : item. router_data . request . get_ip_address_as_optional ( ) ,
3183
- metadata : item. router_data . request . metadata . clone ( ) . map ( Into :: into) ,
3184
3182
merchant_order_reference : item. router_data . request . merchant_order_reference_id . clone ( ) ,
3185
3183
store,
3186
3184
splits,
@@ -3226,6 +3224,8 @@ impl
3226
3224
. clone ( )
3227
3225
. and_then ( |metadata| get_device_fingerprint ( metadata) ) ;
3228
3226
3227
+ let billing_address =
3228
+ get_address_info ( item. router_data . get_optional_billing ( ) ) . and_then ( Result :: ok) ;
3229
3229
let delivery_address =
3230
3230
get_address_info ( item. router_data . get_optional_shipping ( ) ) . and_then ( Result :: ok) ;
3231
3231
let telephone_number = item. router_data . get_optional_billing_phone_number ( ) ;
@@ -3245,7 +3245,7 @@ impl
3245
3245
shopper_locale : None ,
3246
3246
shopper_email : item. router_data . get_optional_billing_email ( ) ,
3247
3247
telephone_number,
3248
- billing_address : None ,
3248
+ billing_address,
3249
3249
delivery_address,
3250
3250
country_code : None ,
3251
3251
line_items : None ,
@@ -3255,7 +3255,6 @@ impl
3255
3255
social_security_number : None ,
3256
3256
shopper_statement : item. router_data . request . statement_descriptor . clone ( ) ,
3257
3257
shopper_ip : item. router_data . request . get_ip_address_as_optional ( ) ,
3258
- metadata : item. router_data . request . metadata . clone ( ) . map ( Into :: into) ,
3259
3258
merchant_order_reference : item. router_data . request . merchant_order_reference_id . clone ( ) ,
3260
3259
store,
3261
3260
splits,
@@ -3336,7 +3335,6 @@ impl
3336
3335
channel : None ,
3337
3336
shopper_statement : item. router_data . request . statement_descriptor . clone ( ) ,
3338
3337
shopper_ip : item. router_data . request . get_ip_address_as_optional ( ) ,
3339
- metadata : item. router_data . request . metadata . clone ( ) . map ( Into :: into) ,
3340
3338
merchant_order_reference : item. router_data . request . merchant_order_reference_id . clone ( ) ,
3341
3339
store,
3342
3340
splits,
@@ -3459,7 +3457,6 @@ impl TryFrom<(&AdyenRouterData<&PaymentsAuthorizeRouterData>, &WalletData)>
3459
3457
channel,
3460
3458
shopper_statement : item. router_data . request . statement_descriptor . clone ( ) ,
3461
3459
shopper_ip : item. router_data . request . get_ip_address_as_optional ( ) ,
3462
- metadata : item. router_data . request . metadata . clone ( ) . map ( Into :: into) ,
3463
3460
merchant_order_reference : item. router_data . request . merchant_order_reference_id . clone ( ) ,
3464
3461
store,
3465
3462
splits,
@@ -3552,7 +3549,6 @@ impl
3552
3549
channel : None ,
3553
3550
shopper_statement : item. router_data . request . statement_descriptor . clone ( ) ,
3554
3551
shopper_ip : item. router_data . request . get_ip_address_as_optional ( ) ,
3555
- metadata : item. router_data . request . metadata . clone ( ) . map ( Into :: into) ,
3556
3552
merchant_order_reference : item. router_data . request . merchant_order_reference_id . clone ( ) ,
3557
3553
store,
3558
3554
splits,
@@ -3605,7 +3601,8 @@ impl
3605
3601
. metadata
3606
3602
. clone ( )
3607
3603
. and_then ( |metadata| get_device_fingerprint ( metadata) ) ;
3608
-
3604
+ let billing_address =
3605
+ get_address_info ( item. router_data . get_optional_billing ( ) ) . and_then ( Result :: ok) ;
3609
3606
let delivery_address =
3610
3607
get_address_info ( item. router_data . get_optional_shipping ( ) ) . and_then ( Result :: ok) ;
3611
3608
Ok ( AdyenPaymentRequest {
@@ -3623,7 +3620,7 @@ impl
3623
3620
shopper_name,
3624
3621
shopper_email,
3625
3622
shopper_locale : None ,
3626
- billing_address : None ,
3623
+ billing_address,
3627
3624
delivery_address,
3628
3625
country_code : None ,
3629
3626
line_items : None ,
@@ -3633,7 +3630,6 @@ impl
3633
3630
social_security_number : None ,
3634
3631
shopper_statement : item. router_data . request . statement_descriptor . clone ( ) ,
3635
3632
shopper_ip : item. router_data . request . get_ip_address_as_optional ( ) ,
3636
- metadata : item. router_data . request . metadata . clone ( ) . map ( Into :: into) ,
3637
3633
merchant_order_reference : item. router_data . request . merchant_order_reference_id . clone ( ) ,
3638
3634
store,
3639
3635
splits,
@@ -5845,7 +5841,6 @@ impl
5845
5841
channel : None ,
5846
5842
shopper_statement : item. router_data . request . statement_descriptor . clone ( ) ,
5847
5843
shopper_ip : item. router_data . request . get_ip_address_as_optional ( ) ,
5848
- metadata : item. router_data . request . metadata . clone ( ) . map ( Into :: into) ,
5849
5844
merchant_order_reference : item. router_data . request . merchant_order_reference_id . clone ( ) ,
5850
5845
mpi_data : Some ( mpi_data) ,
5851
5846
store,
0 commit comments