Merge branch 'master' of git.freeside.biz:/home/git/www

diff --cc associations.html
Simple merge

diff --cc services.html
index 27487f0,27487f0..82a914e
--- 1/services.html
--- 2/services.html
+++ b/services.html
@@@ -95,7 -95,7 +95,7 @@@
  
    <table width="118%" cellpadding="0" cellspacing="0" class="servpurp">
      <tr> 
--      <th align="left" valign="top"><a name="support"><h3>Support Contracts</h3></th>
++      <th align="left" valign="top"><a name="support"><h3>Support Contracts for on-premise implementations</h3></th>
      </tr>
      <tr> 
        <td align="left" valign="top">
@@@ -105,8 -105,8 +105,10 @@@
    <tr>
      <th><!--<B>Services included</B>--></th>
      <!--<th STYLE="background-color: #EDB53B"><B>Bronze</B></th>-->
++<!--
      <th STYLE="background-color: #FDC57B"><B>Bronze</B></th>
      <th STYLE="background-color: #DDDDDD"><B>Silver</B></th>
++-->
      <th STYLE="background-color: #FFEF04"><B>Gold</B></th>
      <th STYLE="background-color: #A7C0C0"><B>Platinum</B></th>
      <th STYLE="background-color: #E0E0FF"><B>Diamond</B></th>
@@@ -115,42 -115,42 +117,50 @@@
  
    <tr>
      <th><!--<B>Services included</B>--></th>
++<!--
      <th STYLE="background-color: #EEEEEE">Basic maintenance only</th>
      <th>Standard support</th>
++-->
      <th>Most popular support level</th>
      <th>Large customizations</th>
--    <th STYLE="background-color: #F0F0F0">Extensive customizations</th>
--    <th STYLE="background-color: #F0F0F0">Dedicated developer</th>
++    <th>Extensive customizations</th>
++    <th>Dedicated developer</th>
    </tr>
  
    <tr>
      <td>Monthly cost</td>
--    <td STYLE="background-color: #EEEEEE"><B>$195</B></td>
--    <td><B>$395</B></td>
--    <td><B>$800</B></td>
--    <td><B>$1600</B></td>
--    <td STYLE="background-color: #F0F0F0"><B>$3200</B></td>
--    <td STYLE="background-color: #F0F0F0"><B>$6400</B></td>
++<!--
++    <td STYLE="background-color: #EEEEEE"><B>$295</B></td>
++    <td><B>$595</B></td>
++-->
++    <td><B>$1200</B></td>
++    <td><B>$2450</B></td>
++    <td><B>$4900</B></td>
++    <td><B>$9900</B></td>
    </tr>
  
    <tr>
      <td>Upgrades (OS, database and Freeside)</td>
++<!--
      <td STYLE="background-color: #EEEEEE"><span class="yes">&#x2714;</span></td>
      <td><span class="yes">&#x2714;</span></td>
++-->
++    <td><span class="yes">&#x2714;</span></td>
++    <td><span class="yes">&#x2714;</span></td>
      <td><span class="yes">&#x2714;</span></td>
      <td><span class="yes">&#x2714;</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="yes">&#x2714;</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="yes">&#x2714;</span></td>
    </tr>
  
    <tr>
      <td><a href="http://cardfortress.com/">CardFortress</a> offsite credit card storage<br>(for PCI compliance)</td>
++<!--
      <td STYLE="background-color: #EEEEEE"><span class="smyes">optional</span></td>
      <td><span class="smyes">optional</span></td>
++-->
++    <td><span class="smyes">optional</span></td>
++    <td><span class="smyes">optional</span></td>
      <td><span class="smyes">optional</span></td>
      <td><span class="smyes">optional</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="smyes">optional</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="smyes">optional</span></td>
    </tr>
  
  <!--
@@@ -167,62 -167,62 +177,74 @@@
  
    <tr>
      <td>Email support</td>
++<!--
      <td STYLE="background-color: #EEEEEE"><span class="yes">&#x2714;</span></td>
      <td><span class="yes">&#x2714;</span></td>
++-->
++    <td><span class="yes">&#x2714;</span></td>
++    <td><span class="yes">&#x2714;</span></td>
      <td><span class="yes">&#x2714;</span></td>
      <td><span class="yes">&#x2714;</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="yes">&#x2714;</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="yes">&#x2714;</span></td>
    </tr>
  
    <tr>
      <td>Phone and IM support<br>(9am-8pm Eastern / 6am-5pm Pacific)</td>
++<!--
      <td STYLE="background-color: #EEEEEE"><span class="no">&#x2716;</span></td>
      <td><span class="yes">&#x2714;</span></td>
++-->
++    <td><span class="yes">&#x2714;</span></td>
++    <td><span class="yes">&#x2714;</span></td>
      <td><span class="yes">&#x2714;</span></td>
      <td><span class="yes">&#x2714;</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="yes">&#x2714;</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="yes">&#x2714;</span></td>
    </tr>
  
    <tr>
      <td>Support for advanced features (e.g. VoIP/CDR billing, commissions, multiple companies)</td>
++<!--
      <td STYLE="background-color: #EEEEEE"><span class="no">&#x2716;</span></td>
      <td><span class="yes">&#x2714;</span></td>
++-->
++    <td><span class="yes">&#x2714;</span></td>
++    <td><span class="yes">&#x2714;</span></td>
      <td><span class="yes">&#x2714;</span></td>
      <td><span class="yes">&#x2714;</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="yes">&#x2714;</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="yes">&#x2714;</span></td>
    </tr>
  
    <tr>
      <td>24/7 emergency support</td>
++<!--
      <td STYLE="background-color: #EEEEEE"><span class="no">&#x2716;</span></td>
      <td><span class="no">&#x2716;</span></td>
++-->
++    <td><span class="yes">&#x2714;</span></td>
++    <td><span class="yes">&#x2714;</span></td>
      <td><span class="yes">&#x2714;</span></td>
      <td><span class="yes">&#x2714;</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="yes">&#x2714;</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="yes">&#x2714;</span></td>
    </tr>
  
    <tr>
      <td>Private mailing list for large providers</td>
++<!--
      <td STYLE="background-color: #EEEEEE"><span class="no">&#x2716;</span></td>
      <td><span class="no">&#x2716;</span></td>
++-->
++    <td><span class="yes">&#x2714;</span></td>
++    <td><span class="yes">&#x2714;</span></td>
      <td><span class="yes">&#x2714;</span></td>
      <td><span class="yes">&#x2714;</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="yes">&#x2714;</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="yes">&#x2714;</span></td>
    </tr>
  
    <tr>
      <td>Customization hours per month<br>(with "rollover" for unused time)</td>
++<!--
      <td STYLE="background-color: #EEEEEE"><span class="no">&#x2716;</span></td>
--    <td><span class="smyes">2&frac12; hours</span></td>
--    <td><span class="smyes">8 hours</span></td>
--    <td><span class="smyes">20 hours</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="smyes">48 hours</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="smyes">100 hours</span></td>
++    <td><span class="smyes">3 hours</span></td>
++-->
++    <td><span class="smyes">10 hours</span></td>
++    <td><span class="smyes">26 hours</span></td>
++    <td><span class="smyes">60 hours</span></td>
++    <td><span class="smyes">128 hours</span></td>
    </tr>
  
  <!-- we still do this for gold+, just trying to make the feature list more
@@@ -240,32 -240,32 +262,38 @@@
  
    <tr>
      <td>Direct access to all developers and staff</td>
++<!--
      <td STYLE="background-color: #EEEEEE"><span class="no">&#x2716;</span></td>
      <td><span class="no">&#x2716;</span></td>
++-->
      <td><span class="no">&#x2716;</span></td>
      <td><span class="yes">&#x2714;</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="yes">&#x2714;</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="yes">&#x2714;</span></td>
++    <td><span class="yes">&#x2714;</span></td>
++    <td><span class="yes">&#x2714;</span></td>
    </tr>
  
    <tr>
      <td>Lead role in defining product roadmap</td>
++<!--
      <td STYLE="background-color: #EEEEEE"><span class="no">&#x2716;</span></td>
      <td><span class="no">&#x2716;</span></td>
++-->
      <td><span class="no">&#x2716;</span></td>
      <td><span class="no">&#x2716;</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="yes">&#x2714;</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="yes">&#x2714;</span></td>
++    <td><span class="yes">&#x2714;</span></td>
++    <td><span class="yes">&#x2714;</span></td>
    </tr>
  
    <tr>
      <td>Dedicated senior developer</td>
++<!--
      <td STYLE="background-color: #EEEEEE"><span class="no">&#x2716;</span></td>
      <td><span class="no">&#x2716;</span></td>
++-->
      <td><span class="no">&#x2716;</span></td>
      <td><span class="no">&#x2716;</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="no">&#x2716;</span></td>
--    <td STYLE="background-color: #F0F0F0"><span class="yes">&#x2714;</span></td>
++    <td><span class="no">&#x2716;</span></td>
++    <td><span class="yes">&#x2714;</span></td>
    </tr>
  
  <!--
@@@ -282,12 -282,12 +310,14 @@@
  
    <tr>
      <td>Discount on additional work<br>(consulting or customizations)</td>
++<!--
      <td STYLE="background-color: #EEEEEE"><B>10%</B></td>
      <td><B>15%</B></td>
--    <td><B>25%</B></td>
++-->
++    <td><B>20%</B></td>
      <td><B>30%</B></td>
--    <td STYLE="background-color: #F0F0F0"><B>40%</B></td>
--    <td STYLE="background-color: #F0F0F0"><B>50%</B></td>
++    <td><B>40%</B></td>
++    <td><B>50%</B></td>
    </tr>
  
  </table>

diff --cc wispa-billing-vendors.html
index 6e02816,2502d00..21ae23d
--- 1/wispa-billing-vendors.html
--- 2/wispa-billing-vendors.html
+++ b/wispa-billing-vendors.html
@@@ -77,9 -80,10 +77,11 @@@ Freeside Internet Services, Inc.<br
      <td><span class="no">&#x2716;</span></td>
      <td><span class="no">&#x2716;</span></td>
      <td><span class="no">&#x2716;</span></td>
 +    <td><span class="no">&#x2716;</span></td>
      <td><span class="yes">&#x2714;</span></td>
      <td><span class="yes">&#x2714;</span></td>
+     <td><span class="no">&#x2716;</span></td>
+     <td><span class="no">&#x2716;</span></td>
      <td><span class="yes">&#x2714;</span></td>
    </tr>
  
@@@ -91,8 -95,9 +93,10 @@@
      <td><span class="no">&#x2716;</span></td>
      <td><span class="no">&#x2716;</span></td>
      <td><span class="no">&#x2716;</span></td>
 +    <td><span class="no">&#x2716;</span></td>
      <td><span class="maybe">new/preliminary</span></td>
+     <td><span class="yes">&#x2714;</span></td>
+     <td><span class="no">&#x2716;</span></td>
      <td><span class="no">&#x2716;</span></td>
    </tr>
  
@@@ -183,10 -195,11 +194,12 @@@
      <td>?</td>
      <td>c. $600</td>
      <td>$1750</td>
 +    <td>?</td>
      <td>$368 <!-- ($314 Platypus + $54 Windows 2012 server &amp; SQL server 2014 Standard w/10 CALs, amortized over 36 months) --></td>
      <td>$3920</td>
+     <td>$1500</td>
      <td>$4375</td>
+     <td>?</td>
      <td>$3150</td>
    </tr>
  
@@@ -240,10 -255,10 +254,11 @@@
      <td>Small</td>
      <td>Large</td>
      <td>Small</td>
 +    <td>Small?</td>
      <td>New product</td>
      <td>Large</td>
-     <td>Large</td>
+     <td>New product</td>
+     <td>New product</td>
      <td>New product</td>
      <td>Medium?</td>
    </tr>
@@@ -267,8 -283,7 +282,8 @@@
      <td>Billing software</td>
      <td>Billing software</td>
      <td>Billing and geologic software</td>
-     <td>Billing software</td>
+     <td>MDU ISP (VideoDirect)</td>
 +    <td>Fiber consulting</td>
      <td>Domain names, mobile phone service (OpenSRS, Ting, Tucows)</td>
      <td>WISP (Bertram wireless)</td>
      <td>Billing software</td>
@@@ -319,7 -339,7 +339,7 @@@
  </table>
  
  <br>
- Last updated Apr 26th, 2018 | <a href="http://freeside.biz/gitlist/www.git/commits/master/wispa-billing-vendors.html">Revision history</a>
 -Last updated May 8th, 2019 | <a href="http://freeside.biz/gitlist/www.git/commits/master/wispa-billing-vendors.html">Revision history</a>
++Last updated May 20th, 2020 | <a href="http://freeside.biz/gitlist/www.git/commits/master/wispa-billing-vendors.html">Revision history</a>
  
  </div>