diff --git a/Controller/AdminController.php b/Controller/AdminController.php index 59f6819..bd42f48 100644 --- a/Controller/AdminController.php +++ b/Controller/AdminController.php @@ -89,6 +89,7 @@ public function editAction(Request $request, WebsiteFeeSubsEntity $subscriber = if ($form->isSubmitted() && $form->isValid()) { $em = $this->getDoctrine()->getManager(); + if (!$doMerge) { $em->persist($subscriber); } diff --git a/Controller/SubscribeController.php b/Controller/SubscribeController.php index 9de57ca..f7a6a12 100644 --- a/Controller/SubscribeController.php +++ b/Controller/SubscribeController.php @@ -21,6 +21,7 @@ namespace Paustian\WebsiteFeeModule\Controller; +use Paustian\WebsiteFeeModule\Entity\WebsiteFeeSubsEntity; use Zikula\Bundle\CoreBundle\Controller\AbstractController; use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -166,7 +167,7 @@ public function subscribepaypalAction(Request $request) : Response { private function _cancelSubscription(int $uid, int $item_no) : void { $subscription = $this->_get_sub($item_no); $gid = $subscription->getWsfgroupid(); - + $e = ""; if (!$this->_modifyUser($gid, $uid, false, $e)) { //write an error to the error log; $this->_set_error("Unable to cancel subscription: $e"); @@ -176,6 +177,7 @@ private function _cancelSubscription(int $uid, int $item_no) : void { private function _addSubscription(int $uid, int $item_no) : void { $subscription = $this->_get_sub($item_no); $gid = $subscription->getWsfgroupid(); + $e = ""; if (!$this->_modifyUser($gid, $uid, true, $e)) { //write an error to the error log; $this->_set_error("Unable to add subscription: $e"); @@ -303,7 +305,7 @@ private function _enterTransaction(int $uid, //now grab the data out of the subsciption table $subscript_info = $this->_get_sub($item_number); - if ($subscript_info == null) { + if (empty($subscript_info)) { $this->_set_error("No item for the item number. Check your subscription setup to insure that your Subscription Item Number matches what you are putting in your paypal button"); return false; } @@ -314,18 +316,19 @@ private function _enterTransaction(int $uid, $this->_set_error("Incorrect reciever Email:" . $receiver_email . ", correct Email should be:" . $email); return false; } + if($subscr_type !== "subscr_cancel"){ + $payment_amt = $subscript_info->getWsfpaymentamount(); + //I added a range because Paypal was being cute and adding tax + if (($payment_gross == -1) || ((($payment_amt - 2) < $payment_gross) && (($payment_amt + 2) > $payment_gross))) { + $payment_gross = $payment_amt; + } - $payment_amt = $subscript_info->getWsfpaymentamount(); - //I added a range because Paypal was being cute and adding tax - if (($payment_gross == -1) || ((($payment_amt - 2) < $payment_gross) && (($payment_amt + 2) > $payment_gross))) { - $payment_gross = $payment_amt; - } - - // check that payment_amount/payment_currency are correct - if ($payment_gross != $payment_amt) { - //wrong amount payed - $this->_set_error("payment inccorect: " . $payment_gross . ", correct amount should be: " . $payment_amt); - return false; + // check that payment_amount/payment_currency are correct + if ($payment_gross != $payment_amt) { + //wrong amount payed + $this->_set_error("payment inccorect: " . $payment_gross . ", correct amount should be: " . $payment_amt); + return false; + } } $transaction = new WebsiteFeeTransEntity(); @@ -352,7 +355,7 @@ private function _enterTransaction(int $uid, * @param int $item_number * @return array */ - private function _get_sub(int $item_number) : array { + private function _get_sub(int $item_number) : ?WebsiteFeeSubsEntity { $em = $this->getDoctrine()->getManager(); $qb = $em->createQueryBuilder(); if (isset($item_number) && is_numeric($item_number)) { @@ -367,7 +370,7 @@ private function _get_sub(int $item_number) : array { $the_item = $query->getResult(); if (empty($the_item)) { - throw new NotFoundHttpException($this->trans('Unable to get subscriber.')); + return null; } return $the_item[0]; } diff --git a/Entity/WebsiteFeeErrorsEntity.php b/Entity/WebsiteFeeErrorsEntity.php index a277b62..c5e73f8 100644 --- a/Entity/WebsiteFeeErrorsEntity.php +++ b/Entity/WebsiteFeeErrorsEntity.php @@ -14,7 +14,7 @@ namespace Paustian\WebsiteFeeModule\Entity; -use Symfony\Component\Validator\Constraints\DateTime; +use DateTime; use Zikula\Bundle\CoreBundle\Doctrine\EntityAccess; use Doctrine\ORM\Mapping as ORM; use Symfony\Component\Validator\Constraints as Assert; @@ -86,7 +86,7 @@ public function getWsferroeexp() : string { return $this->wsferroeexp; } - public function getWsferrdate() : datetime { + public function getWsferrdate() : DateTime { return $this->wsferrdate; } @@ -106,7 +106,7 @@ public function setWsferroeexp(string $wsferroeexp) : void { $this->wsferroeexp = $wsferroeexp; } - public function setWsferrdate(datetime $wsferrdate) : void { + public function setWsferrdate(DateTime $wsferrdate) : void { $this->wsferrdate = $wsferrdate; } diff --git a/Entity/WebsiteFeeSubsEntity.php b/Entity/WebsiteFeeSubsEntity.php index e740681..6016931 100644 --- a/Entity/WebsiteFeeSubsEntity.php +++ b/Entity/WebsiteFeeSubsEntity.php @@ -32,7 +32,7 @@ class WebsiteFeeSubsEntity extends EntityAccess { * WebsiteFeeSubs id * * @ORM\Id - * @ORM\Column(type="integer", length=20) + * @ORM\Column(type="integer", length=11) * @ORM\GeneratedValue(strategy="AUTO") */ private $id; @@ -48,7 +48,7 @@ class WebsiteFeeSubsEntity extends EntityAccess { /** * wsfitem item number that is ordered * - * @ORM\Column(type="integer", length=20) + * @ORM\Column(type="integer", length=11) * @Assert\Type( * type="integer", * message="The value {{ value }} is not a valid {{ type }}.") @@ -67,7 +67,7 @@ class WebsiteFeeSubsEntity extends EntityAccess { private $wsfpaymentamount; /** - * WebsiteFeeSubs wsfsubsname -- the name of the subscription. + * WebsiteFeeSubs wsfemail -- the name of the subscription. * @ORM\Column(type="string", length=255) * @Assert\Email(message = "The email '{{ value }}' is not a valid email.") * @@ -117,7 +117,7 @@ public function setWsfsubsname(string $wsfsubsname) : void { $this->wsfsubsname = $wsfsubsname; } - public function setWsfitem(string $wsfitem) : void { + public function setWsfitem(int $wsfitem) : void { $this->wsfitem = $wsfitem; } diff --git a/Entity/WebsiteFeeTransEntity.php b/Entity/WebsiteFeeTransEntity.php index 52b13ca..a4a0078 100644 --- a/Entity/WebsiteFeeTransEntity.php +++ b/Entity/WebsiteFeeTransEntity.php @@ -14,7 +14,7 @@ namespace Paustian\WebsiteFeeModule\Entity; -use Symfony\Component\Validator\Constraints\DateTime; +use DateTime; use Zikula\Bundle\CoreBundle\Doctrine\EntityAccess; use Doctrine\ORM\Mapping as ORM; use Symfony\Component\Validator\Constraints as Assert; @@ -93,7 +93,7 @@ public function getWsfemail() : string { return $this->wsfemail; } - public function getWsfpaydate() : datetime { + public function getWsfpaydate() : DateTime { return $this->wsfpaydate; } @@ -117,7 +117,7 @@ public function setWsfemail(string $wsfemail) : void { $this->wsfemail = $wsfemail; } - public function setWsfpaydate(datetime $wsfpaydate) : void { + public function setWsfpaydate(DateTime $wsfpaydate) : void { $this->wsfpaydate = $wsfpaydate; } diff --git a/Resources/views/Admin/websitefee_admin_edit.html.twig b/Resources/views/Admin/websitefee_admin_edit.html.twig index 8b2f49d..14e0c14 100644 --- a/Resources/views/Admin/websitefee_admin_edit.html.twig +++ b/Resources/views/Admin/websitefee_admin_edit.html.twig @@ -1,28 +1,26 @@ {% form_theme form '@ZikulaFormExtension/Form/bootstrap_4_zikula_admin_layout.html.twig' %} -
-
-

- - {{ "Edit a Subscription" | trans }} -

-

{{ "Fill in the details for a subscription. This is the data PayPal will check against for adding subscriptions. The group ID is the group to which the user should be added." | trans }}

- {{ showflashes() }} - {{ form_start(form) }} - {{ form_errors(form) }} -
- {{ 'Subscriber' | trans }} - {{ form_row(form.wsfsubsname) }} - {{ form_row(form.wsfitem) }} - {{ form_row(form.wsfpaymentamount) }} - {{ form_row(form.wsfemail) }} - {{ form_row(form.wsfgroupid) }} -
-
-
- {{ form_widget(form.save, {'attr': {'class': 'btn btn-success'}}) }} - {{ form_widget(form.cancel, {'attr': {'class': 'btn btn-cancel'}}) }} -
-
- {{ form_end(form) }} -
+ +

+ + {{ "Edit a Subscription" | trans }} +

+

{{ "Fill in the details for a subscription. This is the data PayPal will check against for adding subscriptions. The group ID is the group to which the user should be added." | trans }}

+{{ showflashes() }} +{{ form_start(form) }} +{{ form_errors(form) }} +
+ {{ 'Subscriber' | trans }} + {{ form_row(form.wsfsubsname) }} + {{ form_row(form.wsfitem) }} + {{ form_row(form.wsfpaymentamount) }} + {{ form_row(form.wsfemail) }} + {{ form_row(form.wsfgroupid) }} +
+
+
+ {{ form_widget(form.save, {'attr': {'class': 'btn btn-success'}}) }} + {{ form_widget(form.cancel, {'attr': {'class': 'btn btn-cancel'}}) }}
+
+{{ form_end(form) }} + diff --git a/Resources/views/Admin/websitefee_admin_index.html.twig b/Resources/views/Admin/websitefee_admin_index.html.twig index 23e12f2..4ae831e 100644 --- a/Resources/views/Admin/websitefee_admin_index.html.twig +++ b/Resources/views/Admin/websitefee_admin_index.html.twig @@ -1,6 +1,4 @@ -
-

{{ 'Welcome to the administration interface for the WebsiteFeeModule module. The only item you set up from here is ' | trans }} - {{ 'subscriptions' | trans }}. {{' The rest of the interaction is - done through an interface with paypal. Go to PayPals' | trans }} {{'button creation tool' | trans }} - {{ ' to create your button. Remember to add the custom parameter with the user id in it' | trans }}

-
\ No newline at end of file +

{{ 'Welcome to the administration interface for the WebsiteFeeModule module. The only item you set up from here is ' | trans }} + {{ 'subscriptions' | trans }}. {{' The rest of the interaction is + done through an interface with paypal. Go to PayPals' | trans }} {{'button creation tool' | trans }} + {{ ' to create your button. Remember to add the custom parameter with the user id in it' | trans }}

diff --git a/Resources/views/Admin/websitefee_admin_modify.html.twig b/Resources/views/Admin/websitefee_admin_modify.html.twig index fde413e..f4ac74c 100644 --- a/Resources/views/Admin/websitefee_admin_modify.html.twig +++ b/Resources/views/Admin/websitefee_admin_modify.html.twig @@ -1,21 +1,20 @@ -
- - +
+ + + + + + + + {% for item in subs %} - - + + - - - {% for item in subs %} - - - - - {% endfor %} - -
{{ 'Subscription Name' | trans }} {{ 'Actions' | trans }}
{{ 'Subscription Name' | trans }} {{ 'Actions' | trans }} {{ item.wsfsubsname }} + + +
{{ item.wsfsubsname }} - - -
-
+ {% endfor %} + + + diff --git a/Resources/views/Admin/websitefee_admin_modifyerrs.html.twig b/Resources/views/Admin/websitefee_admin_modifyerrs.html.twig index 0bef235..e22d14c 100644 --- a/Resources/views/Admin/websitefee_admin_modifyerrs.html.twig +++ b/Resources/views/Admin/websitefee_admin_modifyerrs.html.twig @@ -1,29 +1,27 @@ -
- - +
+ + + + + + + + + + + {% for item in errors %} - - - - - + + + + + - - - {% for item in errors %} - - - - - - - - {% endfor %} - -
{{ 'Request' | trans }}{{ 'Response' | trans }}{{ 'Error Expression' | trans }}{{ 'Date' | trans }} {{ 'Actions' | trans }}
{{ 'Request' | trans }}{{ 'Response' | trans }}{{ 'Error Expression' | trans }}{{ 'Date' | trans }} {{ 'Actions' | trans }} {{ item.wsfrequest }}{{ item.wsfrespone }}{{ item.wsferroeexp }}{{ item.wsferrdate.date }} + +
{{ item.wsfrequest }}{{ item.wsfrespone }}{{ item.wsferroeexp }}{{ item.wsferrdate.date }} - -
-
- -
-
+ {% endfor %} + + +
+ +
diff --git a/Resources/views/Admin/websitefee_admin_modifytrans.html.twig b/Resources/views/Admin/websitefee_admin_modifytrans.html.twig index dacbe06..0ba1a32 100644 --- a/Resources/views/Admin/websitefee_admin_modifytrans.html.twig +++ b/Resources/views/Admin/websitefee_admin_modifytrans.html.twig @@ -1,31 +1,30 @@ -
- - +
+ + + + + + + + + + + + {% for item in trans %} - - - - - - + + + + + + - - - {% for item in trans %} - - - - - - - - - {% endfor %} - -
{{ 'User Name' | trans }}{{ 'Transaction ID' | trans }}{{ 'Transaction Type' | trans }}{{ 'Email' | trans }}{{ 'Date' | trans }} {{ 'Actions' | trans }}
{{ 'User Name' | trans }}{{ 'Transaction ID' | trans }}{{ 'Transaction Type' | trans }}{{ 'Email' | trans }}{{ 'Date' | trans }} {{ 'Actions' | trans }}{{ item.wsfusername }}{{ item.wsftxid }}{{ item.wsfsubtype }}{{ item.wsfemail }}{{ item.wsfpaydate.date }} + +
{{ item.wsfusername }}{{ item.wsftxid }}{{ item.wsfsubtype }}{{ item.wsfemail }}{{ item.wsfpaydate.date }} - -
-
- -
-
+ {% endfor %} + + +
+ +
+ diff --git a/Resources/views/Subscribe/websitefee_subscribe_index.html.twig b/Resources/views/Subscribe/websitefee_subscribe_index.html.twig index a50be04..f956783 100644 --- a/Resources/views/Subscribe/websitefee_subscribe_index.html.twig +++ b/Resources/views/Subscribe/websitefee_subscribe_index.html.twig @@ -1,7 +1,5 @@ {{ pageSetVar('title', 'Index page of the WebsiteFeeModule Module') }} -
-

- {{ "The WebsiteFeeModule Module" | trans }} -

-

There is no user interface to the WebsiteFee Module.

-
+

+ {{ "The WebsiteFeeModule Module" | trans }} +

+

There is no user interface to the WebsiteFee Module.

diff --git a/Resources/views/Subscribe/websitefee_subscribe_testsubscribe.html.twig b/Resources/views/Subscribe/websitefee_subscribe_testsubscribe.html.twig index a4136e1..cdcf1db 100644 --- a/Resources/views/Subscribe/websitefee_subscribe_testsubscribe.html.twig +++ b/Resources/views/Subscribe/websitefee_subscribe_testsubscribe.html.twig @@ -1,51 +1,49 @@ {{ pageSetVar('title', 'Test data for posting') }} -
-

- {{ ("The WebsiteFeeModule Test Data" | trans) }} -

-
-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-

- - -

Transaction Type

- - -
-
+

+{{ ("The WebsiteFeeModule Test Data" | trans) }} +

+
+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+

+ + +

Transaction Type

+ + +
diff --git a/Resources/views/legacy/websitefee_admin_delete.htm b/Resources/views/legacy/websitefee_admin_delete.htm deleted file mode 100644 index 71d2058..0000000 --- a/Resources/views/legacy/websitefee_admin_delete.htm +++ /dev/null @@ -1,15 +0,0 @@ -{* $Id: websitefee_admin_delete.htm,v 1.10 2005/01/26 10:03:25 markwest Exp $ *} -{include file="websitefee_admin_main.htm"} -
-
- - - -
- - -
-
-
-
-{gt text="Cancel"} \ No newline at end of file diff --git a/Resources/views/legacy/websitefee_admin_errors.htm b/Resources/views/legacy/websitefee_admin_errors.htm deleted file mode 100644 index 251cb15..0000000 --- a/Resources/views/legacy/websitefee_admin_errors.htm +++ /dev/null @@ -1,24 +0,0 @@ -{* $Id: websitefee_admin_errors.htm,v 1.14 2006/12/16 10:16:13 Tiomthy Paustian Exp $ *} -{include file="websitefee_admin_main.htm"} -
- - - - - - - - - - - {section name="i" loop=$errors} - - - - - - - {/section} -
{gt text="Delete Error"}{gt text="Request that was sent"}{gt text="Result that came back"}{gt text="Error Information"}
{$errors[i].req}{$errors[i].res}{$errors[i].line}
-

{button src=edit_remove.gif set=icons/small alt="Delete Checked" title="Delete Checked" value="delete_checked"}{gt text="Delete Checked Items"}

-
\ No newline at end of file diff --git a/Resources/views/legacy/websitefee_admin_main.htm b/Resources/views/legacy/websitefee_admin_main.htm deleted file mode 100644 index 1fefbfa..0000000 --- a/Resources/views/legacy/websitefee_admin_main.htm +++ /dev/null @@ -1,11 +0,0 @@ -{* $Id: example_admin_main.htm,v 1.3 2004/12/14 10:57:37 markwest Exp $ *} -{include file="websitefee_admin_menu.htm"} -

{gt text='WebSiteFee Administration'}

-

{gt text='Create the groups and the subscription data for each item users can subscribe to.'}

-

-{gt text='Transactions'}
-{gt text='Errors'}
-{gt text='Create a New Subscription'}
-{gt text='Current Subscriptions'} - -

diff --git a/Resources/views/legacy/websitefee_admin_menu.htm b/Resources/views/legacy/websitefee_admin_menu.htm deleted file mode 100644 index c61f557..0000000 --- a/Resources/views/legacy/websitefee_admin_menu.htm +++ /dev/null @@ -1,4 +0,0 @@ -{* $Id: example_admin_menu.htm,v 1.12 2005/01/19 11:32:47 landseer Exp $ *} -{pngetstatusmsg} -{admincategorymenu} -

{gt text="WebSiteFee"}

\ No newline at end of file diff --git a/Resources/views/legacy/websitefee_admin_modify.htm b/Resources/views/legacy/websitefee_admin_modify.htm deleted file mode 100644 index adaf0de..0000000 --- a/Resources/views/legacy/websitefee_admin_modify.htm +++ /dev/null @@ -1,11 +0,0 @@ -{* $Id: example_admin_modify.htm,v 1.13 2005/01/26 10:03:25 markwest Exp $ *} -{include file="example_admin_menu.htm"} -

{gt text="_EXAMPLEEDIT"}

-
-
-
- -
-
-
-
\ No newline at end of file diff --git a/Resources/views/legacy/websitefee_admin_modifyconfig.htm b/Resources/views/legacy/websitefee_admin_modifyconfig.htm deleted file mode 100644 index 1150fc8..0000000 --- a/Resources/views/legacy/websitefee_admin_modifyconfig.htm +++ /dev/null @@ -1,12 +0,0 @@ -{* $Id: websitefee_admin_modifyconfig.htm,v 1.11 2005/01/26 09:57:27 markwest Exp $ *} -{include file="websitefee_admin_menu.htm"} -

{gt text="_MODIFYCONFIG"}

-
-
- -
- -
-
-
-
\ No newline at end of file diff --git a/Resources/views/legacy/websitefee_admin_modifysub.htm b/Resources/views/legacy/websitefee_admin_modifysub.htm deleted file mode 100644 index c05cb33..0000000 --- a/Resources/views/legacy/websitefee_admin_modifysub.htm +++ /dev/null @@ -1,29 +0,0 @@ -{* $Id: websitefee_admin_modifysub.htm,v 1.14 2006/12/16 10:16:13 Tiomthy Paustian Exp $ *} -{include file="websitefee_admin_main.htm"} -
- - - - - - - - - - - - - - - - - - - - - - - -
{gt text="Field Name"}{gt text="Field Value"}
{gt text="Item Name"}
{gt text="Item Number"}
{gt text="Payment Amount"}
{gt text="Seller Email"}
{gt text="Subscription Group"}
- -
\ No newline at end of file diff --git a/Resources/views/legacy/websitefee_admin_new.htm b/Resources/views/legacy/websitefee_admin_new.htm deleted file mode 100644 index 1ac0d46..0000000 --- a/Resources/views/legacy/websitefee_admin_new.htm +++ /dev/null @@ -1,11 +0,0 @@ -{* $Id: example_admin_new.htm,v 1.11 2005/01/26 10:03:25 markwest Exp $ *} -{include file="websitefee_admin_menu.htm"} -

{gt text="_WEBSITEFEEADD"}

-
-
-
- -
-
-
-
\ No newline at end of file diff --git a/Resources/views/legacy/websitefee_admin_newsub.htm b/Resources/views/legacy/websitefee_admin_newsub.htm deleted file mode 100644 index de94b2e..0000000 --- a/Resources/views/legacy/websitefee_admin_newsub.htm +++ /dev/null @@ -1,28 +0,0 @@ -{* $Id: websitefee_admin_newsub.htm,v 1.14 2006/12/16 10:16:13 Tiomthy Paustian Exp $ *} -{include file="websitefee_admin_main.htm"} -
- - - - - - - - - - - - - - - - - - - - - - -
{gt text="Field Name"}{gt text="Field Value"}
{gt text="Item Name"}
{gt text="Item number"}
{gt text="Subscription cost"}
{gt text="Seller Email"}
{gt text="Group ID to add subscriber to"}
- -
\ No newline at end of file diff --git a/Resources/views/legacy/websitefee_admin_view.htm b/Resources/views/legacy/websitefee_admin_view.htm deleted file mode 100644 index 1f191ee..0000000 --- a/Resources/views/legacy/websitefee_admin_view.htm +++ /dev/null @@ -1,29 +0,0 @@ -{* $Id: websitefee_admin_view.htm,v 1.14 2006/12/16 10:16:13 Tiomthy Paustian Exp $ *} -{include file="websitefee_admin_main.htm"} -
- - - - - - - - - - - - - {section name="i" loop=$transactions} - - - - - - - - - - {/section} -
{gt text="Delete Item"}{gt text="User Name"}{gt text="Transacion ID"}{gt text="Subscription Type"}{gt text="Payer Email"}{gt text="Payment Date"}
{$transactions[i].user_name}{$transactions[i].txn_id}{$transactions[i].subscr_type}{$transactions[i].payer_email}{$transactions[i].payment_date}
-

{pnbutton src=edit_remove.gif set=icons/small alt="Delete Checked" title="Delete Checked" value="delete_checked"}{gt text="Delete Checked Items"}

-
\ No newline at end of file diff --git a/Resources/views/legacy/websitefee_admin_viewsubs.htm b/Resources/views/legacy/websitefee_admin_viewsubs.htm deleted file mode 100644 index 4664e86..0000000 --- a/Resources/views/legacy/websitefee_admin_viewsubs.htm +++ /dev/null @@ -1,30 +0,0 @@ -{* $Id: websitefee_admin_viewsubitems.htm,v 1.14 2006/12/16 10:16:13 Tiomthy Paustian Exp $ *} -{include file="websitefee_admin_main.htm"} -
- - - - - - - - - - - - - - {section name="i" loop=$sub_items} - - - - - - - - - - {/section} -
{gt text="Delete Item"}{gt text="Item"}{gt text="Item Name"}{gt text="Payment Amount"}{gt text="Seller Email"}{gt text="Group ID"}{gt text="Action"}
{$sub_items[i].item}{$sub_items[i].item_name}{$sub_items[i].payment_amount}{$sub_items[i].seller_email}{$sub_items[i].group_id}{gt text="Edit Subscription"}
-

{pnbutton src=edit_remove.gif set=icons/small alt="Delete Checked" title="Delete Checked" value="delete_checked"}{gt text="Delete Checked Items"}

-
\ No newline at end of file diff --git a/Resources/views/legacy/websitefee_user_welcome.htm b/Resources/views/legacy/websitefee_user_welcome.htm deleted file mode 100644 index 624ea88..0000000 --- a/Resources/views/legacy/websitefee_user_welcome.htm +++ /dev/null @@ -1,16 +0,0 @@ - -

Welcome

-

Dear {$u_name}

-

Thank you for purchasing {$book_name}. We hope it helps you in your studies. -Just as a reminder, this is not a regular textbook; take advantage of all the features it has -to offer. Here are just a few examples to help you get started

- -

If you have questions, or are confused about anything, don't hesitate to use the contact form and thanks again for purchasing the text.

- -

Sincerely

-

Gary Roberts and Timothy Paustian