Skip to content

Commit

Permalink
Merge pull request #1480 from angelleye/PFW-661
Browse files Browse the repository at this point in the history 
Credit Card Expiration Date Fields CSS Conflict : PFW-661
  • Loading branch information
@deepakmaurya
deepakmaurya committed Jul 30, 2020
2 parents b1db403 + c95f479 commit d6133d6
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 28 deletions.
62 changes: 42 additions & 20 deletions assets/css/angelleye-cc-ui.css
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,58 @@
.woocommerce #payment .form-row select, .woocommerce-page #payment .form-row select {
padding: 7px;
margin: 0 6px 0 0;
border-color: #c7c1c6;
border-top-color: rgb(199, 193, 198);
border-top-color: #bbb3b9;
background-repeat: no-repeat;
background-size: 32px 20px;
border-radius: 3px;
font-size: 1.5em;
color: #939393;
}
.woocommerce-page #payment .form-row select option {
color: black;
}
.et_pb_module #wcf-embed-checkout-form .woocommerce #order_review .payment_method_braintree .input-text {
font-size: 21px;
}
.theme-Divi p.woocommerce-notice.woocommerce-notice--success.woocommerce-thankyou-order-received {
margin-bottom: 1.625em;
}

.woocommerce-checkout #payment div.payment_box .wc-credit-card-form-cardholder {
font-size: 1.5em;
padding: 8px;
background-repeat: no-repeat;
background-position: right .618em center;
background-size: 32px 20px;
}

.woocommerce-page #payment .form-row select.woocommerce-cc-year {
width: 48%;
min-width: 100px;
color: #43454b;
display: inline-block;
margin-bottom: 0px;
vertical-align: baseline;
}
.woocommerce-page #payment .form-row select.woocommerce-cc-month {
width: 52%;
width: 48%;
min-width: 100px;
color: #43454b;
display: inline-block;
margin-right: 5px;
margin-bottom: 10px;
vertical-align: baseline;
}
.woocommerce-page #payment .form-row select.woocommerce-cc-year {
width: 43%;
.theme-storefront.woocommerce-page #payment .form-row select.woocommerce-cc-month, .theme-storefront.woocommerce-page #payment .form-row select.woocommerce-cc-year {
font-size: 1.41575em;
padding: 0.6180469716em;
background-color: #f2f2f2;
color: #43454b;
border: 0;
box-sizing: border-box;
font-weight: normal;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.125);
min-width: 135px;
}
.theme-Avada.woocommerce-page #payment .form-row label[for="cc-expire-month"]{
width: 100%;
display: block;
}



.woocommerce form .form-row.woocommerce-validated select.woocommerce-cc-month, .woocommerce form .form-row.woocommerce-validated select.woocommerce-cc-year {
border: 1px solid #bbb;
}
@media (max-width:572px) {
.payment_method_paypal_pro_payflow .form-row, .payment_method_paypal_pro .form-row {
float: none !important;
width: auto !important;
margin: 0 auto 0 auto;
}
}
8 changes: 4 additions & 4 deletions classes/wc-gateway-paypal-pro-angelleye.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ public function paypal_for_woocommerce_paypal_pro_credit_card_form_expiration_da
$form_html = "";
$form_html .= '<p class="' . $class . '">';
$form_html .= '<label for="cc-expire-month">' . apply_filters( 'cc_form_label_expiry', __("Expiration Date", 'paypal-for-woocommerce'), $this->id ) . '<span class="required">*</span></label>';
$form_html .= '<select ' . $this->field_name('card_expiration_month') . ' class="woocommerce-select woocommerce-cc-month mr5">';
$form_html .= '<select ' . $this->field_name('card_expiration_month') . ' class="woocommerce-select woocommerce-cc-month mr5 wc-credit-card-form-card-cvc">';
$form_html .= '<option value="">' . __('Month', 'paypal-for-woocommerce') . '</option>';
$months = array();
for ($i = 1; $i <= 12; $i++) :
Expand All @@ -646,7 +646,7 @@ public function paypal_for_woocommerce_paypal_pro_credit_card_form_expiration_da
}
}
$form_html .= '</select>';
$form_html .= '<select ' . $this->field_name('card_expiration_year') . ' class="woocommerce-select woocommerce-cc-year ml5">';
$form_html .= '<select ' . $this->field_name('card_expiration_year') . ' class="woocommerce-select woocommerce-cc-year ml5 wc-credit-card-form-card-cvc">';
$form_html .= '<option value="">' . __('Year', 'paypal-for-woocommerce') . '</option>';
for ($i = date('y'); $i <= date('y') + 15; $i++) {
if($this->credit_card_year_field == 'four_digit') {
Expand Down Expand Up @@ -1527,11 +1527,11 @@ public function angelleye_woocommerce_credit_card_form_start($current_id) {
if ($this->enable_cardholder_first_last_name && $current_id == $this->id) {
$fields['card-cardholder-first'] = '<p class="form-row form-row-first">
<label for="' . esc_attr($this->id) . '-card-first-name">' . __('Cardholder First Name', 'paypal-for-woocommerce') . '</label>
<input class="input-text wc-credit-card-form-cardholder" type="text" autocomplete="off" placeholder="' . esc_attr__('First Name', 'paypal-for-woocommerce') . '" ' . $this->field_name('card-cardholder-first') . '/>
<input class="input-text wc-credit-card-form-card-cvc" type="text" autocomplete="off" placeholder="' . esc_attr__('First Name', 'paypal-for-woocommerce') . '" ' . $this->field_name('card-cardholder-first') . '/>
</p>';
$fields['card-cardholder-last'] = '<p class="form-row form-row-last">
<label for="' . esc_attr($this->id) . '-card-last-name">' . __('Cardholder Last Name', 'paypal-for-woocommerce') . '</label>
<input class="input-text wc-credit-card-form-cardholder" type="text" autocomplete="off" placeholder="' . __('Last Name', 'paypal-for-woocommerce') . '" ' . $this->field_name('card-cardholder-last') . '/>
<input class="input-text wc-credit-card-form-card-cvc" type="text" autocomplete="off" placeholder="' . __('Last Name', 'paypal-for-woocommerce') . '" ' . $this->field_name('card-cardholder-last') . '/>
</p>';

foreach ($fields as $field) {
Expand Down
8 changes: 4 additions & 4 deletions classes/wc-gateway-paypal-pro-payflow-angelleye.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1536,7 +1536,7 @@ public function paypal_for_woocommerce_paypal_pro_payflow_credit_card_form_expir
$form_html = "";
$form_html .= '<p class="form-row form-row-first">';
$form_html .= '<label for="cc-expire-month">' . apply_filters('cc_form_label_expiry', __("Expiration Date", 'paypal-for-woocommerce'), $this->id) . '<span class="required">*</span></label>';
$form_html .= '<select ' . $this->field_name('card_expiration_month') . ' class="woocommerce-select woocommerce-cc-month mr5">';
$form_html .= '<select ' . $this->field_name('card_expiration_month') . ' class="woocommerce-select woocommerce-cc-month mr5 wc-credit-card-form-card-cvc">';
$form_html .= '<option value="">' . __('Month', 'paypal-for-woocommerce') . '</option>';
$months = array();
for ($i = 1; $i <= 12; $i++) :
Expand All @@ -1557,7 +1557,7 @@ public function paypal_for_woocommerce_paypal_pro_payflow_credit_card_form_expir
}
}
$form_html .= '</select>';
$form_html .= '<select ' . $this->field_name('card_expiration_year') . ' class="woocommerce-select woocommerce-cc-year ml5">';
$form_html .= '<select ' . $this->field_name('card_expiration_year') . ' class="woocommerce-select woocommerce-cc-year ml5 wc-credit-card-form-card-cvc">';
$form_html .= '<option value="">' . __('Year', 'paypal-for-woocommerce') . '</option>';
for ($i = date('y'); $i <= date('y') + 15; $i++) {
if ($this->credit_card_year_field == 'four_digit') {
Expand Down Expand Up @@ -1716,11 +1716,11 @@ public function angelleye_woocommerce_credit_card_form_start($current_id) {
if ($this->enable_cardholder_first_last_name && $current_id == $this->id) {
$fields['card-cardholder-first'] = '<p class="form-row form-row-first">
<label for="' . esc_attr($this->id) . '-card-first-name">' . __('Cardholder First Name', 'paypal-for-woocommerce') . '</label>
<input class="input-text wc-credit-card-form-cardholder" type="text" autocomplete="off" placeholder="' . esc_attr__('First Name', 'paypal-for-woocommerce') . '" ' . $this->field_name('card-cardholder-first') . ' />
<input class="input-text wc-credit-card-form-card-cvc" type="text" autocomplete="off" placeholder="' . esc_attr__('First Name', 'paypal-for-woocommerce') . '" ' . $this->field_name('card-cardholder-first') . ' />
</p>';
$fields['card-cardholder-last'] = '<p class="form-row form-row-last">
<label for="' . esc_attr($this->id) . '-card-last-name">' . __('Cardholder Last Name', 'paypal-for-woocommerce') . '</label>
<input class="input-text wc-credit-card-form-cardholder" type="text" autocomplete="off" placeholder="' . __('Last Name', 'paypal-for-woocommerce') . '" ' . $this->field_name('card-cardholder-last') . ' />
<input class="input-text wc-credit-card-form-card-cvc" type="text" autocomplete="off" placeholder="' . __('Last Name', 'paypal-for-woocommerce') . '" ' . $this->field_name('card-cardholder-last') . ' />
</p>';

foreach ($fields as $field) {
Expand Down

0 comments on commit d6133d6

Please sign in to comment.