Merge pull request #75 from companieshouse/release/4.34.0

Release/4.34.0

Author: CarlSwan

Makefile

@@ -1,3 +1,8 @@
+PERL_DEPS_SERVER_URL ?= s3://release.ch.gov.uk/ch.gov.uk-deps
+PERL_DEPS_VERSION    ?= 1.0.0
+PERL_DEPS_PACKAGE    ?= ch.gov.uk-deps-$(PERL_DEPS_VERSION).zip
+PERL_DEPS_URL        ?= $(PERL_DEPS_SERVER_URL)/$(PERL_DEPS_PACKAGE)
+
 LOCAL           ?= ./local
 
 SMARTPAN_URL    ?= http://darkpan.ch.gov.uk:7050
@@ -24,6 +29,10 @@ api-enumerations/.git:
 	git submodule init
 	git submodule update
 
+deps:
+	test -d $(CURDIR)/local || { aws s3 cp $(PERL_DEPS_URL) .; unzip -q $(PERL_DEPS_PACKAGE) -d $(CURDIR)/local; }
+	test -f $(PERL_DEPS_PACKAGE) && rm -f $(PERL_DEPS_PACKAGE)
+
 getpan:
 	getpan $(GETPAN_ARGS)
 
@@ -63,4 +72,4 @@ package:
 
 dist: build package
 
-.PHONY: all build clean dist package getpan test test-unit test-int
+.PHONY: all build clean dist package getpan test test-unit test-int deps

api-enumerations

@@ -48,6 +48,7 @@ external_url_for:
   follow_company      : '<CHS_MONITOR_GUI_URL>/company/:company_number/confirm-follow'
   unfollow_company    : '<CHS_MONITOR_GUI_URL>/company/:company_number/confirm-unfollow'
   file_accounts       : '<EXTERNAL_FILE_ACCOUNTS_URL>'
+  file_cic_accounts   : '<EXTERNAL_FILE_CIC_ACCOUNTS_URL>'
 
 admin_url_for:
   roles                        : <ACCOUNT_URL>/admin/roles

appconfig.yml

@@ -35,8 +35,9 @@ sub list {
                     $doc->{closed_at_date} = CH::Util::DateHelper->isodate_as_string($doc->{closed_at});
                     $doc->{closed_at_time} = CH::Util::DateHelper->isotime_as_string($doc->{closed_at})->strftime("%l:%M%P");
                 }
-                if ($doc->{status} eq "open" && $doc->{resume_journey_uri}) {
-                   $self->_build_resume_link($doc, $doc->{resume_journey_uri});
+                if  (($doc->{status} eq "open" ||
+                      $doc->{status} eq "closed pending payment") && $doc->{resume_journey_uri}) {
+                        $self->_build_resume_link($doc, $doc->{resume_journey_uri});
                 }
             }
 
@@ -57,7 +58,7 @@ sub list {
 
             $self->render;
         },
-        
+
         failure => sub {
             my ($api, $tx) = @_;
             my $error_code = $tx->error->{code} // 0;
@@ -76,10 +77,10 @@ sub list {
 
 sub _build_resume_link {
     my ($self, $transaction, $resume_link) = @_;
-    
+
     my $transaction_id = $transaction->{id};
     my $encoded_resume_link = encode_base64url($resume_link);
-    
+
     $transaction->{resume_link} = "/user/transactions/" . $transaction_id . "/resume?link=" . $encoded_resume_link;
     return;
 }

lib/ChGovUk/Controllers/Admin/User/Filings.pm

@@ -19,9 +19,9 @@ sub record_feedback {
         customer_name       => $self->_sanitize_param('customer_name'),
         customer_email      => $self->_sanitize_param('customer_email'),
         customer_feedback   => $self->_sanitize_param('customer_feedback'),
-        source_url          => $self->_sanitize_param('source_url'),
+        source_url          => $self->_sanitize_param('source_url') =~ /sourceurl=([^&#]*)/,
     };
-    
+
     # check the feedback looks ok?
     return $self->_render_json_error('No feedback entered. Please enter some feedback.', 1)
         unless $feedback->{customer_feedback};
@@ -40,16 +40,10 @@ sub record_feedback {
     if (not $feedback->{customer_name}) {
         $feedback->{customer_name} = '(not provided)';
     }
-    
+
     debug 'Writing customer FEEDBACK to ['.$self->ch_api->admin->customer_feedback->path.']';
 
-    $self->ch_api->admin->customer_feedback->create({
-        kind                => $feedback->{kind},
-        customer_name       => $feedback->{customer_name},
-        customer_email      => $feedback->{customer_email},
-        customer_feedback   => $feedback->{customer_feedback},
-        source_url          => $feedback->{source_url},
-    })->on(
+    $self->ch_api->admin->customer_feedback->create($feedback)->on(
         success => sub {
             my ( $api, $tx ) = @_;
             return $self->render(json => { message => 'Feedback saved OK' });

lib/ChGovUk/Controllers/CustomerFeedback.pm

@@ -131,12 +131,23 @@
   </header>
   <!--end header-->
 
+% if $feedback_banner {
+  <div class="govuk-body" id="chs-customer-insights-top">
+   <div class="govuk-width-container">
+     <a href="http://resources.companieshouse.gov.uk/csat/index.shtml?Service=CHS">Tell us what you think of Companies House</a>
+   </div>
+ </div>
+% }
+
   <main id="page-container" class="search <% $classes %>" role="main">
 
-        <div class="phase-banner">
-            <div class="small-text"><a href="http://resources.companieshouse.gov.uk/serviceInformation.shtml#compInfo" target="_blank">Companies House does not verify the accuracy of the information filed<span class="visuallyhidden">(link opens a new window)</span></a></span>
-            </div>
-        </div>
+  % if !$feedback_banner {
+    <div class="phase-banner">
+      % } else {
+    <div>
+  % }
+<div class="small-text"><a href="http://resources.companieshouse.gov.uk/serviceInformation.shtml#compInfo" target="_blank">Companies House does not verify the accuracy of the information filed<span class="visuallyhidden">(link opens a new window)</span></a></div>
+    </div>
 
     % if $user_bar != false {
         <div class="js-toggle-nav" id="global-nav">
@@ -184,21 +195,19 @@
     <div id="<% (! $disable_header_search) ? 'content-container' : 'search-container' %>">
 	% block content -> { ; }
     </div>
-
+    
   </main>
 
   <!--end main-->
   <div class="push"></div>
 
-
 </div> <!-- end of entire-wrapper -->
 
-% if ! $c.config.disable_feedback_form {
-    <!-- powered by feedback.js -->
-    <div class="feedback-wrapper">
-    	 % include "includes/feedback.tx" { header_or_body => 'header' }
-    </div>
-
+% if $insights_bar != false {
+<div id="chs-customer-insights">
+   <a href="https://www.surveymonkey.co.uk/r/chsat-migrt" target="_blank" onclick="javascript:_paq.push(['trackEvent', 'Beta', 'Feedback']);">Tell us what you think of this service<span class="hidden">(link opens a new window)</span></a>
+   <a id="feedback-link" class="secondary-customer-insights" target="_blank">Is there anything wrong with this page?<span class="hidden">(link opens a new window)</span></a>
+</div>
 % }
 
     <footer class="group js-footer" id="footer" role="contentinfo">
@@ -219,6 +228,10 @@
 
    <!-- BEGIN Companies House Scripts -->
     <% include 'includes/piwik.tx' %>
+
+    <script>
+      document.getElementById("feedback-link").setAttribute("href", "/help/feedback?sourceurl=" +  window.location.href);
+    </script>
    <!-- End of Companies House Scripts -->
 </body>
 </html>

templates/base.tx

@@ -203,13 +203,20 @@
 
                     % if $company.company_number == $c.authorised_company && !$c.config.disable_filing {
                         % if $file_accounts {
-                            <p>
-                                  <a href="<% $c.external_url_for('file_accounts', company_number => $company.company_number)%>" id="file-accounts" data-event-id="file-accounts" class="button piwik-event"><% l('File accounts') %>
+                          % if $company.is_community_interest_company {
+                              <p>
+                              <a href="<% $c.external_url_for('file_cic_accounts', company_number => $company.company_number)%>" id="file-accounts" data-event-id="file-accounts" class="button piwik-event"><% l('File accounts') %>
                                 </a>
-                            </p>
+                              </p>
+                            % }
+                            % else {
+                              <p>
+                                <a href="<% $c.external_url_for('file_accounts', company_number => $company.company_number)%>" id="file-accounts" data-event-id="file-accounts" class="button piwik-event"><% l('File accounts') %>
+                                </a>
+                              </p>
+                           % }
                         % }
                     % }
-
                 % }
                 % if $company.latest_made_up_date {
                     <p>Last accounts made up to <strong><% $c.isodate_as_string($company.latest_made_up_date) %></strong></p>

templates/company/view.html.tx

@@ -7,15 +7,15 @@
     <div class="panel">
         <form action="/customer-feedback" class="form" enctype="" method="post" name="" id="feedback-form">
         <input type="hidden" name="source_url" value="" id="source-url-field">
-        <h2 class="heading-medium">Help us improve the Companies House service</h2>
+        <h2 class="heading-large" style="width: 500px;">Help us improve the Companies House service</h2>
         <div id="feedback-failed" style="display: none;">
             <p>Your submission has not been successful, please try again</p>
         </div>
         <fieldset>
             <legend class="visuallyhidden">Is there anything wrong with this page?</legend>
             <p><a href="https://www.gov.uk/stop-companies-house-from-publishing-your-address" target="_blank">Stop Companies House from publishing your address</a></p>
             <div class="form-group">
-                <label for="feedback-textarea" class="form-label"><strong>What is wrong with this page?</strong>
+                <label for="feedback-textarea" class="form-label"><strong>What is wrong with the page?</strong>
                 <span class="form-hint">For example, information is missing or incorrect.</span></label>
                 <textarea rows="5" maxlength="300" id="feedback-textarea" name="customer_feedback" cols="30" class="form-control" required></textarea>
             </div>

templates/includes/feedback.tx

@@ -32,15 +32,15 @@
                     % if $c.can_do('/admin/transaction-lookup') {
                         <a class="admin-link" id="view-transaction-<% $~transaction %>" href="<% $c.url_for('admin_transaction_details', transaction_number => $transaction.id) %>"> View transaction</a>
                     % }
-                    
+
                     % if $c.can_do('/admin/transaction-reprocess') && $transaction.status == "closed" {
 
                         <form method="post" action="<% $c.url_for('admin_transaction_reprocess', transaction_number => $transaction.id) %>">
                             <div class="form-group">
                                 <input type="submit" id="reprocess" name="reprocess" class="admin-link" value="Reprocess transaction">
                             </div>
                         </form>
-                        
+
                     % }
                 </div>
                 <div class="column-third column-reference" id="reference-number-<% $~transaction.count %>">
@@ -57,6 +57,13 @@
                     <div class="column-third column-status" id="status-<% $~transaction.count %>">
                         Status<strong> Processing </strong>
                     </div>
+                % } else if $transaction.status == "closed pending payment" {
+                    <div class="column-third column-status" id="status-<% $~transaction.count %>">
+                        Status<strong> Pending payment </strong>
+                        % if $transaction.resume_link && !$c.can_do('/admin/transaction-lookup') {
+                            <a class="piwik-event" data-event-id="Pay now" id="transaction-<% $~transaction.count %>-resume-link" href="<% $transaction.resume_link %>">Pay now</a>
+                        % }
+                    </div>
                 % } else {
                     <div class="column-third column-received_on" id="received-on-<% $~transaction.count %>">
                         Received on <strong><% $transaction.closed_at_date %> at <% $transaction.closed_at_time %></strong>

templates/includes/transactions.tx

@@ -0,0 +1,46 @@
+% cascade base { title => 'Feedback form - Companies House service', disable_header_search => 1, user_bar => false, insights_bar => false, }
+
+% around content -> {
+
+<div id="feedback-received" class="no-script">
+  <h2 class="heading-medium">Thank you, your submission has been accepted</h2>
+</div>
+
+<div id="feedback-form-container">
+        <form action="/customer-feedback" class="form" enctype="" method="post" name="" id="feedback-form">
+        <input type="hidden" name="source_url" value="" id="source-url-field">
+        <div class="text">
+          <h1 class="heading" id="main">Help us improve the Companies House service</h1>
+        </div>
+        <div id="feedback-failed" class="no-script">
+            <p>Your submission has not been successful, please try again</p>
+        </div>
+        <fieldset>
+            <legend class="visuallyhidden">Is there anything wrong with this page?</legend>
+            <p><a href="https://www.gov.uk/stop-companies-house-from-publishing-your-address" target="_blank">Stop Companies House from publishing your address<span class="visuallyhidden">(link opens a new window)</span></a></p>
+            <div class="form-group">
+                <label for="feedback-textarea" class="form-label"><strong>What is wrong with the page?</strong>
+                <span class="form-hint">For example, information is missing or incorrect.</span></label>
+                <textarea rows="5" maxlength="300" id="feedback-textarea" name="customer_feedback" cols="30" class="form-control" required></textarea>
+            </div>
+            <div class="form-group">
+                <label class="form-label" for="feedback-name"><strong>What is your name?</strong> (optional) </label>
+                <input autocomplete="off"  id ="feedback-name" class="form-control" name="customer_name" type="text" value="">
+            </div>
+            <div class="form-group" style="display: none;">
+                <label class="form-label" for="feedback-check">confirmation</label>
+                <input autocomplete="off"  id ="feedback-check" name="customer_realcheck" type="text" value="">
+            </div>
+            <div class="form-group">
+                <label class="form-label" for="feedback-email"><strong>What is your email address?</strong> (optional) </label>
+                <input autocomplete="off" id="feedback-email" class="form-control" name="customer_email" type="email" value="">
+            </div>
+                <div class="form-group" id="auth-form-group">
+                    <label class="form-label" id="auth-code-label" for="feedback-auth"><strong>Enter these characters to prove you're not a robot </strong></label>
+                    <input autocomplete="off" id="feedback-auth" class="form-control form-control-1-8" required name="customer_auth" type="numbers" value="">
+                </div>
+            <input type="submit" class="button" id="submit-report" value="Submit report">
+        </fieldset>
+        </form>
+</div><!--toggle-->
+% }