diff --git a/css/admin.css b/css/admin.css index 60d6660..6a95cb8 100644 --- a/css/admin.css +++ b/css/admin.css @@ -54,3 +54,28 @@ .form-table.pronamic-gf-links-tab fieldset { line-height: 2.75em; } + +/* line 98, ../scss/admin.scss */ +.pronamic-pay-gf-form-choice-list { + margin: 0 !important; +} + +/* line 102, ../scss/admin.scss */ +.pronamic-pay-gf-form-choice-list > li { + margin: 0; +} + +/* line 110, ../scss/admin.scss */ +.pronamic-pay-gf-form-choice .pronamic-pay-gf-form-choice-checked { + margin-left: 2em; +} + +/* line 114, ../scss/admin.scss */ +.pronamic-pay-gf-form-choice > input + label + .pronamic-pay-gf-form-choice-checked { + display: none; +} + +/* line 118, ../scss/admin.scss */ +.pronamic-pay-gf-form-choice > input:checked + label + .pronamic-pay-gf-form-choice-checked { + display: block; +} diff --git a/css/admin.css.map b/css/admin.css.map index 77c5f86..9e6e12a 100644 --- a/css/admin.css.map +++ b/css/admin.css.map @@ -1 +1 @@ -{"version":3,"sources":["admin.css"],"names":[],"mappings":"AAAA,gCAAgC;AAChC;EACE,mBAAmB;EACnB,YAAY;EACZ,aAAa;CACd;;AAED,iCAAiC;AACjC;EACE,gBAAgB;CACjB;;AAED,iCAAiC;AACjC;EACE,iBAAiB;CAClB;AACD,iCAAiC;AACjC;EACE,iBAAiB;CAClB;AACD,iCAAiC;AACjC;EACE,iBAAiB;CAClB;AACD,iCAAiC;AACjC;EACE,wBAAwB;CACzB;AACD,iCAAiC;AACjC;EACE,eAAe;CAChB;;AAED,iCAAiC;AACjC;EACE,cAAc;EACd,aAAa;EACb,gBAAgB;EAChB,kBAAkB;EAClB,aAAa;EACb,sBAAsB;CACvB;AACD,iCAAiC;AACjC;;EAEE,eAAe;CAChB;;AAED,iCAAiC;AACjC;EACE,eAAe;CAChB;AACD,iCAAiC;AACjC;EACE,oBAAoB;CACrB","file":"admin.css","sourcesContent":["/* line 8, ../scss/admin.scss */\n#tab_pronamic_pay h3 .dashicons.fa- {\n font-size: inherit;\n width: auto;\n height: auto;\n}\n\n/* line 18, ../scss/admin.scss */\n#titlediv + #gf-pay-feed-editor {\n margin-top: 1em;\n}\n\n/* line 24, ../scss/admin.scss */\n#gf-pay-feed-editor .form-table ul {\n margin: 10px 0 0;\n}\n/* line 30, ../scss/admin.scss */\n#gf-pay-feed-editor .pronamic-pay-tab .pronamic-pay-tab-block {\n background: #fff;\n}\n/* line 36, ../scss/admin.scss */\n#gf-pay-feed-editor .pronamic-pay-tab .pronamic-pay-table-striped tr:not(.even) {\n background: #fff;\n}\n/* line 42, ../scss/admin.scss */\n#gf-pay-feed-editor .pronamic-pay-tab input + select {\n vertical-align: initial;\n}\n/* line 50, ../scss/admin.scss */\n#gf-pay-feed-editor .pronamic-gf-subscription-tab fieldset .pronamic-pay-gf-subscription-trial-settings label {\n display: block;\n}\n\n/* line 60, ../scss/admin.scss */\n.gforms_edit_form .ideal-edit-link {\n display: none;\n float: right;\n font-size: 10px;\n line-height: 16px;\n height: 16px;\n text-decoration: none;\n}\n/* line 76, ../scss/admin.scss */\n.gforms_edit_form .field_hover .ideal-edit-link,\n.gforms_edit_form .field_selected .ideal-edit-link {\n display: block;\n}\n\n/* line 85, ../scss/admin.scss */\n.form-table .pronamic-pay-description {\n display: block;\n}\n/* line 91, ../scss/admin.scss */\n.form-table.pronamic-gf-links-tab fieldset {\n line-height: 2.75em;\n}\n"]} \ No newline at end of file +{"version":3,"sources":["admin.css"],"names":[],"mappings":"AAAA,gCAAgC;AAChC;EACE,mBAAmB;EACnB,YAAY;EACZ,aAAa;CACd;;AAED,iCAAiC;AACjC;EACE,gBAAgB;CACjB;;AAED,iCAAiC;AACjC;EACE,iBAAiB;CAClB;AACD,iCAAiC;AACjC;EACE,iBAAiB;CAClB;AACD,iCAAiC;AACjC;EACE,iBAAiB;CAClB;AACD,iCAAiC;AACjC;EACE,wBAAwB;CACzB;AACD,iCAAiC;AACjC;EACE,eAAe;CAChB;;AAED,iCAAiC;AACjC;EACE,cAAc;EACd,aAAa;EACb,gBAAgB;EAChB,kBAAkB;EAClB,aAAa;EACb,sBAAsB;CACvB;AACD,iCAAiC;AACjC;;EAEE,eAAe;CAChB;;AAED,iCAAiC;AACjC;EACE,eAAe;CAChB;AACD,iCAAiC;AACjC;EACE,oBAAoB;CACrB;;AAED,iCAAiC;AACjC;EACE,qBAAqB;CACtB;;AAED,kCAAkC;AAClC;EACE,UAAU;CACX;;AAED,kCAAkC;AAClC;EACE,iBAAiB;CAClB;;AAED,kCAAkC;AAClC;EACE,cAAc;CACf;;AAED,kCAAkC;AAClC;EACE,eAAe;CAChB","file":"admin.css","sourcesContent":["/* line 8, ../scss/admin.scss */\n#tab_pronamic_pay h3 .dashicons.fa- {\n font-size: inherit;\n width: auto;\n height: auto;\n}\n\n/* line 18, ../scss/admin.scss */\n#titlediv + #gf-pay-feed-editor {\n margin-top: 1em;\n}\n\n/* line 24, ../scss/admin.scss */\n#gf-pay-feed-editor .form-table ul {\n margin: 10px 0 0;\n}\n/* line 30, ../scss/admin.scss */\n#gf-pay-feed-editor .pronamic-pay-tab .pronamic-pay-tab-block {\n background: #fff;\n}\n/* line 36, ../scss/admin.scss */\n#gf-pay-feed-editor .pronamic-pay-tab .pronamic-pay-table-striped tr:not(.even) {\n background: #fff;\n}\n/* line 42, ../scss/admin.scss */\n#gf-pay-feed-editor .pronamic-pay-tab input + select {\n vertical-align: initial;\n}\n/* line 50, ../scss/admin.scss */\n#gf-pay-feed-editor .pronamic-gf-subscription-tab fieldset .pronamic-pay-gf-subscription-trial-settings label {\n display: block;\n}\n\n/* line 60, ../scss/admin.scss */\n.gforms_edit_form .ideal-edit-link {\n display: none;\n float: right;\n font-size: 10px;\n line-height: 16px;\n height: 16px;\n text-decoration: none;\n}\n/* line 76, ../scss/admin.scss */\n.gforms_edit_form .field_hover .ideal-edit-link,\n.gforms_edit_form .field_selected .ideal-edit-link {\n display: block;\n}\n\n/* line 85, ../scss/admin.scss */\n.form-table .pronamic-pay-description {\n display: block;\n}\n/* line 91, ../scss/admin.scss */\n.form-table.pronamic-gf-links-tab fieldset {\n line-height: 2.75em;\n}\n\n/* line 98, ../scss/admin.scss */\n.pronamic-pay-gf-form-choice-list {\n margin: 0 !important;\n}\n\n/* line 102, ../scss/admin.scss */\n.pronamic-pay-gf-form-choice-list > li {\n margin: 0;\n}\n\n/* line 110, ../scss/admin.scss */\n.pronamic-pay-gf-form-choice .pronamic-pay-gf-form-choice-checked {\n margin-left: 2em;\n}\n\n/* line 114, ../scss/admin.scss */\n.pronamic-pay-gf-form-choice > input + label + .pronamic-pay-gf-form-choice-checked {\n display: none;\n}\n\n/* line 118, ../scss/admin.scss */\n.pronamic-pay-gf-form-choice > input:checked + label + .pronamic-pay-gf-form-choice-checked {\n display: block;\n}\n"]} \ No newline at end of file diff --git a/css/admin.min.css b/css/admin.min.css index 90c3ae6..f0954bc 100644 --- a/css/admin.min.css +++ b/css/admin.min.css @@ -1 +1 @@ -#tab_pronamic_pay h3 .dashicons.fa-{font-size:inherit;width:auto;height:auto}#titlediv+#gf-pay-feed-editor{margin-top:1em}#gf-pay-feed-editor .form-table ul{margin:10px 0 0}#gf-pay-feed-editor .pronamic-pay-tab .pronamic-pay-tab-block{background:#fff}#gf-pay-feed-editor .pronamic-pay-tab .pronamic-pay-table-striped tr:not(.even){background:#fff}#gf-pay-feed-editor .pronamic-pay-tab input+select{vertical-align:initial}#gf-pay-feed-editor .pronamic-gf-subscription-tab fieldset .pronamic-pay-gf-subscription-trial-settings label{display:block}.gforms_edit_form .ideal-edit-link{display:none;float:right;font-size:10px;line-height:16px;height:16px;text-decoration:none}.gforms_edit_form .field_hover .ideal-edit-link,.gforms_edit_form .field_selected .ideal-edit-link{display:block}.form-table .pronamic-pay-description{display:block}.form-table.pronamic-gf-links-tab fieldset{line-height:2.75em} \ No newline at end of file +#tab_pronamic_pay h3 .dashicons.fa-{font-size:inherit;width:auto;height:auto}#titlediv+#gf-pay-feed-editor{margin-top:1em}#gf-pay-feed-editor .form-table ul{margin:10px 0 0}#gf-pay-feed-editor .pronamic-pay-tab .pronamic-pay-tab-block{background:#fff}#gf-pay-feed-editor .pronamic-pay-tab .pronamic-pay-table-striped tr:not(.even){background:#fff}#gf-pay-feed-editor .pronamic-pay-tab input+select{vertical-align:initial}#gf-pay-feed-editor .pronamic-gf-subscription-tab fieldset .pronamic-pay-gf-subscription-trial-settings label{display:block}.gforms_edit_form .ideal-edit-link{display:none;float:right;font-size:10px;line-height:16px;height:16px;text-decoration:none}.gforms_edit_form .field_hover .ideal-edit-link,.gforms_edit_form .field_selected .ideal-edit-link{display:block}.form-table .pronamic-pay-description{display:block}.form-table.pronamic-gf-links-tab fieldset{line-height:2.75em}.pronamic-pay-gf-form-choice-list{margin:0!important}.pronamic-pay-gf-form-choice-list>li{margin:0}.pronamic-pay-gf-form-choice .pronamic-pay-gf-form-choice-checked{margin-left:2em}.pronamic-pay-gf-form-choice>input+label+.pronamic-pay-gf-form-choice-checked{display:none}.pronamic-pay-gf-form-choice>input:checked+label+.pronamic-pay-gf-form-choice-checked{display:block} \ No newline at end of file diff --git a/js/admin.js b/js/admin.js index abafcaa..7ac1e3e 100644 --- a/js/admin.js +++ b/js/admin.js @@ -1,4 +1,3 @@ -/* global ajaxurl */ /* global gform */ /* global form */ /* global SetFieldProperty */ @@ -12,17 +11,7 @@ // Elements var elements = {}; - elements.feed = $element.find( '#gf_ideal_feed' ); - elements.gravityForm = $element.find( '#gf_ideal_gravity_form' ); - elements.formId = $element.find( '#_pronamic_pay_gf_form_id' ); - elements.configId = $element.find( '#gf_ideal_config_id' ); - elements.delayPostCreationItem = $element.find( '#gf_ideal_delay_post_creation_item' ); - elements.confirmationSelectFields = $element.find( '.gf_ideal_confirmation_select' ); - elements.userRoleFieldId = $element.find( '#gf_ideal_user_role_field_id' ); - elements.delayNotifications = $element.find( '#gf_ideal_delay_notifications' ); - elements.fieldSelectFields = $element.find( 'select.field-select' ); elements.subscriptionAmountType = $element.find( 'input[name="_pronamic_pay_gf_subscription_amount_type"]' ); - elements.subscriptionAmountField = $element.find( '#pronamic_pay_gf_subscription_amount_field' ); elements.subscriptionIntervalType = $element.find( 'input[name="_pronamic_pay_gf_subscription_interval_type"]' ); elements.subscriptionInterval = $element.find( '#pronamic_pay_gf_subscription_interval' ); elements.subscriptionIntervalPeriod = $element.find( '#pronamic_pay_gf_subscription_interval_period' ); @@ -30,458 +19,97 @@ elements.subscriptionIntervalDate = $element.find( '#pronamic_pay_gf_subscription_interval_date' ); elements.subscriptionIntervalDateDay = $element.find( '#pronamic_pay_gf_subscription_interval_date_day' ); elements.subscriptionIntervalDateMonth = $element.find( '#pronamic_pay_gf_subscription_interval_date_month' ); - elements.subscriptionIntervalField = $element.find( '#pronamic_pay_gf_subscription_interval_field' ); - elements.subscriptionFrequencyType = $element.find( 'input[name="_pronamic_pay_gf_subscription_frequency_type"]' ); - elements.subscriptionNumberPeriods = $element.find( '#pronamic_pay_gf_subscription_number_periods' ); - elements.subscriptionFrequencyField = $element.find( '#pronamic_pay_gf_subscription_frequency_field' ); - elements.subscriptionTrialEnabled = $element.find( '#pronamic_pay_gf_subscription_trial_enabled' ); - - // Data - var feed = JSON.parse( elements.feed.val() ); - var gravityForm = JSON.parse( elements.gravityForm.val() ); /** - * Update delay post creation item + * Update fields */ - this.updateDelayPostCreationItem = function() { - var display = false; + this.updateFields = function() { + elements.subscriptionAmountType.on( 'change', function() { + var amountType = elements.subscriptionAmountType.filter( ':checked' ).val(); - if ( gravityForm ) { - // Displaying delayed post creation setting if current form has a post field - var postFields = obj.getFieldsByType( [ 'post_title', 'post_content', 'post_excerpt', 'post_category', 'post_custom_field', 'post_image', 'post_tag' ] ); + if ( '' === amountType ) { + elements.subscriptionAmountType.parents( 'tr' ).siblings().hide(); + } else { + elements.subscriptionAmountType.parents('tr').siblings().show(); - if ( postFields.length > 0 ) { - display = true; - } - } - - elements.delayPostCreationItem.toggle( display ); - }; + // Set background color of visible even rows + var rows = elements.subscriptionAmountType.parents( 'table' ).find( 'tr' ); - /** - * Update confirmations - */ - this.updateConfirmationFields = function() { - elements.confirmationSelectFields.empty(); - $( '