| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/Form.php |
| — | — | @@ -455,7 +455,7 @@ |
| 456 | 456 | $return .= ' <td><label><input type="radio" name="amountRadio" value="250" ' . ( $amount == '250' ? $checked : '' ) . '/> 250</label></td>'; |
| 457 | 457 | $return .= ' <td>'; |
| 458 | 458 | $return .= ' <input type="radio" name="amountRadio" id="input_amount_other" value="other" ' . ( $isOther ? $checked : '' ) . ' />'; |
| 459 | | - $return .= ' <label><input type="text" class="txt-sm hint" name="amountGiven" size="4" id="other-amount" title="Other..." onfocus="" value="' . $amountOther . '" /></label>'; |
| | 459 | + $return .= ' <label><input type="text" class="txt-sm hint" name="amountGiven" size="4" id="other-amount" title="Other..." onfocus="" value="' . htmlspecialchars( $amountOther ) . '" /></label>'; |
| 460 | 460 | |
| 461 | 461 | // Add hidden amount field for validation |
| 462 | 462 | $return .= Html::hidden( 'amount', $amount ); |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/Form.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 463 | 463 | Merged /branches/fundraising/extensions/DonationInterface/gateway_forms/Form.php:r95724-100157 |
| 464 | 464 | Merged /trunk/extensions/DonationInterface/gateway_forms/Form.php:r75657-77440,77442-79147,79149-79286,79288-79296,79298-79299,79301-79303,79305-86440,90286,92825,96120-96121,96125,97945-99042,99045-99408,99503,99555,99568,100119-101026,101060,101063-101064,101073,101076,101335,101441,101501-101502,101549,101553,101557,101561,101638,101700,101719,101757,101785,101823,101826,101837,101846,101852,101870-101872,101882,101890,101910,101917,101929,101947,101949-101951,101955-101960,101964-101966,102030,102032-102033,102047,102050-102052,102054,102056,102058,102065,102076,102081,102085-102087,102118,102120,102124-102125,102127,102134,102140,102147,102151-102152,102155-102156,102185-102186,102188-102241,102261,102308,102318,102332,102338,102341-102342,102345,102424-102425,102445,102463,102467-102468,102470,102476,102479-102480,102549-102550,102576-102581,102590,102594,102596,102611,102639,102664,102681,102685,102689,102698,102700-102703,102707,102711-102712,102714,102729,102736,102752,102763,102805,102809-102810,102812,102819-102824,102826,102828-102833,102835-102836,102841,102872,102936,102938,102943,103009,103023-103024,103026-103027,103032,103036-103038,103040,103044,103070,103105,103219,103223,103229,103235,103237-103239,103243-103247,103253,103255,103259,103281,103371,103397,103399,103401,103411,103413,103434-103435,103481,103500,103503,103515,103519,103537,103541,103548,103591,103607-103608,103633,103636,103680,103775,103784,103837,103839,103863,103866,105371 |
| 465 | 465 | Merged /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_forms/Form.php:r99568 |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/js/gc.js |
| — | — | @@ -53,6 +53,7 @@ |
| 54 | 54 | 'utm_source': $( "input[name='utm_source']" ).val(), |
| 55 | 55 | 'utm_campaign': $( "input[name='utm_campaign']" ).val(), |
| 56 | 56 | 'utm_medium': $( "input[name='utm_medium']" ).val(), |
| | 57 | + 'referrer': $( "input[name='referrer']" ).val(), |
| 57 | 58 | 'format': 'json' |
| 58 | 59 | }; |
| 59 | 60 | $.ajax( { |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/js/gc.js |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 60 | 61 | Merged /trunk/extensions/DonationInterface/globalcollect_gateway/forms/js/gc.js:r75657-77440,77442-79147,79149-79286,79288-79296,79298-79299,79301-79303,79305-86440,90286,92825,96120-96121,96125,97945-99042,99045-99408,99503,99555,99568,99570-101026,101056,101060,101063-101064,101071-101074,101076,101099,101109,101112,101163,101180,101192,101200,101205,101207,101217,101230,101232,101236,101335,101382,101399,101441,101501-101504,101512,101541,101547,101549,101553-101555,101557,101559,101561,101563,101576,101578-101579,101631,101633,101638,101669,101676,101679,101689,101700,101706,101719,101740,101747,101757,101764,101778-101779,101781,101785-101789,101798,101823,101826,101837,101846,101852,101870-101872,101878,101882,101890,101892,101910,101917,101929,101947,101949-101951,101955-101960,101962,101964-101966,101996,102003,102011-102012,102030,102032-102033,102047,102050-102052,102054,102056,102058,102065,102076,102081,102085-102087,102118,102120,102123-102127,102130,102134,102140,102147,102151-102152,102155-102156,102186,102188-102242,102252,102258-102261,102263,102267,102269,102307-102309,102313,102318,102332,102341-102342,102345,102364,102419,102424-102425,102445,102463,102467-102468,102470,102476,102479-102480,102549-102550,102576-102581,102590,102594,102596,102611,102639,102664,102682,102689,102698,102700-102703,102707,102711-102712,102714,102729,102733,102736,102740,102752,102763,102805,102807,102809,102812,102819-102824,102826,102830-102831,102833,102835,102841,102872,102878,102915,102921-102923,102926-102928,102932,102936,102938,102942-102943,102946,102953,102960-102961,103009,103023,103026-103027,103032,103036-103038,103040,103044,103050,103058,103067,103077,103080,103130,103219,103223,103229,103235,103237-103239,103243,103245,103247,103253,103255,103259,103261-103262,103264,103275,103278,103284,103289-103291,103325,103371,103397,103399,103401,103421,103434-103435,103481,103519,103537,103541,103548,103591,103607,103680,103784,103871,103960,103963,103972,103983,104611,105392 |
| 61 | 62 | Merged /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/js/gc.js:r99568 |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/js/webitects.js |
| — | — | @@ -55,6 +55,7 @@ |
| 56 | 56 | 'utm_source': $( "input[name='utm_source']" ).val(), |
| 57 | 57 | 'utm_campaign': $( "input[name='utm_campaign']" ).val(), |
| 58 | 58 | 'utm_medium': $( "input[name='utm_medium']" ).val(), |
| | 59 | + 'referrer': $( "input[name='referrer']" ).val(), |
| 59 | 60 | 'format': 'json' |
| 60 | 61 | }; |
| 61 | 62 | $.ajax( { |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/js/webitects.js |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 62 | 63 | Merged /trunk/extensions/DonationInterface/globalcollect_gateway/forms/js/webitects.js:r75657-77440,77442-79147,79149-79286,79288-79296,79298-79299,79301-79303,79305-86440,90286,92825,96120-96121,96125,97945-99042,99045-99408,99503,99555,99568,99570-101026,101056,101060,101063-101064,101071-101074,101076,101099,101109,101112,101163,101180,101192,101200,101205,101207,101217,101230,101232,101236,101335,101382,101399,101441,101501-101504,101512,101541,101547,101549,101553-101555,101557,101559,101561,101563,101576,101578-101579,101631,101633,101638,101669,101676,101679,101689,101700,101706,101719,101740,101747,101757,101764,101778-101779,101781,101785-101789,101798,101823,101826,101837,101846,101852,101870-101872,101878,101882,101890,101892,101910,101917,101929,101947,101949-101951,101955-101960,101962,101964-101966,101996,102003,102011-102012,102030,102032-102033,102047,102050-102052,102054,102056,102058,102065,102076,102081,102085-102087,102118,102120,102123-102127,102130,102134,102140,102147,102151-102152,102155-102156,102186,102188-102242,102252,102258-102261,102263,102267,102269,102307-102309,102313,102318,102332,102341-102342,102345,102364,102419,102424-102425,102445,102463,102467-102468,102470,102476,102479-102480,102549-102550,102576-102581,102590,102594,102596,102611,102639,102664,102682,102689,102698,102700-102703,102707,102711-102712,102714,102729,102733,102736,102740,102752,102763,102805,102807,102809,102812,102819-102824,102826,102830-102831,102833,102835,102841,102872,102878,102915,102921-102923,102926-102928,102932,102936,102938,102942-102943,102946,102953,102960-102961,103009,103023,103026-103027,103032,103036-103038,103040,103044,103050,103058,103067,103077,103080,103130,103219,103223,103229,103235,103237-103239,103243,103245,103247,103253,103255,103259,103261-103262,103264,103275,103278,103284,103289-103291,103325,103371,103397,103399,103401,103421,103434-103435,103481,103519,103537,103541,103548,103591,103607,103680,103784,103871,103960,103963,103972,103983,104611,105392 |
| 63 | 64 | Merged /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/globalcollect_gateway/forms/js/webitects.js:r99568 |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/interface.i18n.php |
| — | — | @@ -23390,6 +23390,7 @@ |
| 23391 | 23391 | 'donate_interface-BMD' => 'Dolyar ng Bermuda', |
| 23392 | 23392 | 'donate_interface-BOB' => 'Bulibyano ng Bulibya', |
| 23393 | 23393 | 'donate_interface-BRL' => 'Real ng Brasil', |
| | 23394 | + 'donate_interface-BSD' => 'Dolyar ng Bahamas', |
| 23394 | 23395 | 'donate_interface-BZD' => 'Dolyar ng Belis', |
| 23395 | 23396 | 'donate_interface-CAD' => 'Dolyar ng Kanada', |
| 23396 | 23397 | 'donate_interface-CHF' => 'Prangko ng Suwisa', |
| — | — | @@ -23428,6 +23429,7 @@ |
| 23429 | 23430 | 'donate_interface-NZD' => 'Dolyar ng Bagong Selanda', |
| 23430 | 23431 | 'donate_interface-OMR' => 'Rial ng Oman', |
| 23431 | 23432 | 'donate_interface-PAB' => 'Balboa ng Panama', |
| | 23433 | + 'donate_interface-PEN' => 'Nuevo sol ng Peru', |
| 23432 | 23434 | 'donate_interface-PHP' => 'Piso ng Pilipinas', |
| 23433 | 23435 | 'donate_interface-PKR' => 'Rupee ng Pakistan', |
| 23434 | 23436 | 'donate_interface-PLN' => 'Złoty ng Polonya', |
| — | — | @@ -23655,8 +23657,15 @@ |
| 23656 | 23658 | 'donate_interface-state-dropdown-XX' => 'Nasa labas ng Estados Unidos', |
| 23657 | 23659 | 'donate_interface-bt-account_holder' => 'May-hawak ng kuwenta', |
| 23658 | 23660 | 'donate_interface-bt-bank_account_number' => 'Bilang ng kuwenta sa bangko', |
| | 23661 | + 'donate_interface-bt-country_description' => 'Paglalarawan ng bansa', |
| | 23662 | + 'donate_interface-bt-payment_reference' => 'Sanggunian sa pagbayad', |
| 23659 | 23663 | 'donate_interface-bt-swift_code' => 'Kodigong Swift', |
| | 23664 | + 'donate_interface-bt-special_id' => 'Natatanging ID', |
| | 23665 | + 'donate_interface-bt-information' => 'Impormasyon sa pagsasalin sa bangko', |
| 23660 | 23666 | 'donate_interface-bt-finished' => 'Tapos na', |
| | 23667 | + 'donate_interface-obt-customer_payment_reference' => 'Sanggunian blg.', |
| | 23668 | + 'donate_interface-obt-information' => 'Impormasyon sa pagsasalin sa bangko sa Internet', |
| | 23669 | + 'donate_interface-online_bank_transfer_message' => 'Pagbabangko sa Telepono at Internet - BPAY®', |
| 23661 | 23670 | 'donate_interface-rtbt-issuer_id' => 'Pumili ng Bangko', |
| 23662 | 23671 | 'donate_interface-rtbt-issuer_id-longlist' => 'Ibang mga bangko', |
| 23663 | 23672 | 'donate_interface-dd-account_name' => 'Pangalan ng kuwenta', |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/interface.i18n.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 23664 | 23673 | Merged /trunk/extensions/DonationInterface/gateway_common/interface.i18n.php:r105361 |
| Index: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/donation.api.php |
| — | — | @@ -112,6 +112,7 @@ |
| 113 | 113 | 'utm_source' => $this->defineParam( false ), |
| 114 | 114 | 'utm_campaign' => $this->defineParam( false ), |
| 115 | 115 | 'utm_medium' => $this->defineParam( false ), |
| | 116 | + 'referrer' => $this->defineParam( false ), |
| 116 | 117 | ); |
| 117 | 118 | } |
| 118 | 119 | |
| — | — | @@ -180,6 +181,7 @@ |
| 181 | 182 | 'utm_source' => 'Tracking variable', |
| 182 | 183 | 'utm_campaign' => 'Tracking variable', |
| 183 | 184 | 'utm_medium' => 'Tracking variable', |
| | 185 | + 'referrer' => 'Original referrer', |
| 184 | 186 | ); |
| 185 | 187 | } |
| 186 | 188 | |
| Property changes on: branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/donation.api.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 187 | 189 | Merged /trunk/extensions/DonationInterface/gateway_common/donation.api.php:r75657-77440,77442-79147,79149-79286,79288-79296,79298-79299,79301-79303,79305-86440,90286,92825,96120-96121,96125,97945-99042,99045-99408,99503,99555,99568,99570-101026,101056,101060,101063-101064,101071-101074,101076,101099,101109,101112,101163,101180,101192,101200,101205,101207,101217,101230,101232,101236,101335,101382,101399,101441,101501-101504,101512,101541,101547,101549,101553-101555,101557,101559,101561,101563,101576,101578-101579,101631,101633,101638,101669,101676,101679,101689,101700,101706,101719,101740,101747,101757,101764,101778-101779,101781,101785-101789,101798,101823,101826,101837,101846,101852,101870-101872,101878,101882,101890,101892,101910,101917,101929,101947,101949-101951,101955-101960,101962,101964-101966,101996,102003,102011-102012,102030,102032-102033,102047,102050-102052,102054,102056,102058,102065,102076,102081,102085-102087,102118,102120,102123-102127,102130,102134,102140,102147,102151-102152,102155-102156,102186,102188-102242,102252,102258-102261,102263,102267,102269,102307-102309,102313,102318,102332,102338,102341-102342,102345,102364,102419,102424-102425,102445,102463,102467-102468,102470,102476,102479-102480,102549-102550,102576-102581,102590,102594,102596,102611,102639,102664,102681-102682,102685,102689,102698,102700-102703,102707,102711-102712,102714,102729,102733,102736,102740,102752,102763,102805,102807,102809-102810,102812,102819-102824,102826,102828-102833,102835-102836,102841,102872,102878,102915,102921-102923,102926-102928,102932,102936,102938,102942-102943,102946,102953,102960-102961,103009,103023-103024,103026-103027,103032,103036-103038,103040,103044,103050,103058,103067,103077,103080,103130,103219,103223,103229,103235,103237-103239,103243-103247,103253,103255,103259,103261-103262,103264,103275,103278,103284,103289-103291,103325,103371,103397,103399,103401,103411,103413,103421,103434-103435,103481,103500,103503,103515,103519,103537,103541,103548,103591,103607-103608,103633,103680,103775,103784,103837,103839,103863,103866,104065,104194,104210,104243,104298,104362,104485,104587,104611,105392 |
| 188 | 190 | Merged /branches/fundraising/deployment/payments_1.17/extensions/DonationInterface/gateway_common/donation.api.php:r99568 |