[freeside-commits] branch FREESIDE_4_BRANCH updated. 230b1e7633fc8158dcb69ceaa224f7854ae11334

Christopher Burger burgerc at 420.am
Thu Jul 13 06:07:02 PDT 2017


The branch, FREESIDE_4_BRANCH has been updated
       via  230b1e7633fc8158dcb69ceaa224f7854ae11334 (commit)
       via  7ca292b76e8bdcda3b55ac6f5575f78ff5060a4d (commit)
       via  a8395b86770797a4fbfcbb95b7f1b777af381a4b (commit)
      from  7bc20f13e95cb43e12e6a937d6940c82036cdf42 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 230b1e7633fc8158dcb69ceaa224f7854ae11334
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Thu Apr 6 09:21:06 2017 -0400

    RT# 74665 - small cleanup of code, removed text value
    
    Conflicts:
    	httemplate/edit/quotation.html

diff --git a/httemplate/edit/quotation.html b/httemplate/edit/quotation.html
index 25966e4..753cd23 100644
--- a/httemplate/edit/quotation.html
+++ b/httemplate/edit/quotation.html
@@ -18,7 +18,7 @@
                    { field=>'custnum',               type=>'fixed-cust_main' },
                    { field=>'_date',                 type=>'fixed-date' },
                    { field=>'quotation_description', type=>'text', size=>50 },
-                   { field=>'close_date',            type=>'input-date-field', value=>'30' },
+                   { field=>'close_date',            type=>'input-date-field' },
                    { field=>'confidence',            type=>'text', size=>3, postfix=>'%' },
                    ($can_disable ? { field=>'disabled', type=>'checkbox', value=>'Y'} : ()),
                               ],

commit 7ca292b76e8bdcda3b55ac6f5575f78ff5060a4d
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Thu Apr 6 09:09:57 2017 -0400

    RT# 74665 -  set a default close date if global config quotation_disable_after_days is set
    
    Conflicts:
    	httemplate/edit/quotation.html

diff --git a/httemplate/edit/quotation.html b/httemplate/edit/quotation.html
index ab1d524..25966e4 100644
--- a/httemplate/edit/quotation.html
+++ b/httemplate/edit/quotation.html
@@ -18,7 +18,7 @@
                    { field=>'custnum',               type=>'fixed-cust_main' },
                    { field=>'_date',                 type=>'fixed-date' },
                    { field=>'quotation_description', type=>'text', size=>50 },
-                   { field=>'close_date',            type=>'input-date-field' },
+                   { field=>'close_date',            type=>'input-date-field', value=>'30' },
                    { field=>'confidence',            type=>'text', size=>3, postfix=>'%' },
                    ($can_disable ? { field=>'disabled', type=>'checkbox', value=>'Y'} : ()),
                               ],
@@ -44,4 +44,4 @@ my $conf = new FS::Conf;
 
 my $default_close_days ||= $conf->config('quotation_disable_after_days');
 
-</%init>
+</%init>
\ No newline at end of file

commit a8395b86770797a4fbfcbb95b7f1b777af381a4b
Author: Justin DeVuyst <justin at devuyst.com>
Date:   Mon Mar 20 16:17:56 2017 -0400

    Add configurable daily auto-disable for quotations.  See RT#74665.

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index b58069f..fe53587 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1531,6 +1531,13 @@ and customer address. Include units.',
   },
 
   {
+    'key'         => 'quotation_disable_after_days',
+    'section'     => 'quotations',
+    'description' => 'The number of days, if set, after which a non-converted quotation will be automatically disabled.',
+    'type'        => 'text'
+  },
+
+  {
     'key'         => 'invoice_print_pdf',
     'section'     => 'printing',
     'description' => 'For all invoice print operations, store postal invoices for download in PDF format rather than printing them directly.',
diff --git a/FS/FS/Cron/disable_quotation.pm b/FS/FS/Cron/disable_quotation.pm
new file mode 100644
index 0000000..fde2686
--- /dev/null
+++ b/FS/FS/Cron/disable_quotation.pm
@@ -0,0 +1,21 @@
+package FS::Cron::disable_quotation;
+
+use vars qw( @ISA @EXPORT_OK );
+use Exporter;
+use FS::UID qw(dbh);
+use FS::Conf;
+
+ at ISA = qw( Exporter );
+ at EXPORT_OK = qw( disable_quotation );
+
+sub disable_quotation {
+    if ( my $days = FS::Conf->new->config( 'quotation_disable_after_days' ) ) {
+        my $sth = dbh->prepare(
+            "UPDATE quotation SET disabled = 'Y' WHERE _date < ?"
+        ) or die dbh->errstr;
+        $sth->execute( time - ( $days * 86400 ) ) or die $sth->errstr;
+        dbh->commit or die dbh->errstr if $FS::UID::AutoCommit;
+    }
+}
+
+1;
diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 233e162..e0c555f 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -91,6 +91,10 @@ export_batch_submit(%opt);
 use FS::Cron::send_subscribed qw(send_subscribed);
 send_subscribed(%opt);
 
+#does nothing unless quotation_disable_after_days is set.
+use FS::Cron::disable_quotation qw(disable_quotation);
+disable_quotation();
+
 #clears out cacti imports & deletes select database cache files
 use FS::Cron::cleanup qw( cleanup cleanup_before_backup );
 cleanup_before_backup();

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Conf.pm                   |    7 +++++++
 FS/FS/Cron/disable_quotation.pm |   21 +++++++++++++++++++++
 FS/bin/freeside-daily           |    4 ++++
 httemplate/edit/quotation.html  |    2 +-
 4 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 FS/FS/Cron/disable_quotation.pm




More information about the freeside-commits mailing list