Bump version and update Changes

[app-web-oof.git] / lib / App / Web / Oof.pm

diff --git a/lib/App/Web/Oof.pm b/lib/App/Web/Oof.pm
index c3aeeb1883c5b07012a273a876da0a926bead690..f9f34f312c139d38f3da2f4eb8f9183b22de9533 100644 (file)
--- a/lib/App/Web/Oof.pm
+++ b/lib/App/Web/Oof.pm
@@ -6,7 +6,7 @@ use warnings;
 use utf8;
 use parent qw/Plack::Component/;
 
-our $VERSION = '0.000_006';
+our $VERSION = '0.000_008';
 
 use DBIx::Simple;
 use Email::Sender::Simple 'sendmail';
@@ -17,6 +17,7 @@ use HTML::Element::Library;
 use JSON::MaybeXS qw/encode_json decode_json/;
 use Plack::Builder;
 use Plack::Request;
+use Text::CSV;
 use Try::Tiny;
 
 sub HTML::Element::iter3 {
@@ -43,7 +44,7 @@ my $postage_per_item = $ENV{OOF_POSTAGE_PER_ITEM} // 50;
 ##################################################
 
 my %db;
-my ($form, $continue, $order, $details, $pay);
+my ($form, $continue, $order, $details, $pay, $display, $down);
 
 {
        sub parse_html {
@@ -58,6 +59,8 @@ my ($form, $continue, $order, $details, $pay);
        $order    = parse_html 'order';
        $details  = parse_html 'details';
        $pay      = parse_html 'pay';
+       $display  = parse_html 'display';
+       $down     = parse_html 'down';
 }
 
 sub stringify_money { sprintf "£%.2f", $_[0] / 100 }
@@ -72,12 +75,16 @@ sub make_slug {
 sub product_to_schemaorg {
        my ($include_url, %data) = @_;
        my $stock = $data{stock} > 0 ? 'InStock' : 'OutOfStock';
+       my @extra;
+       push @extra, (brand => {'@type' => 'Brand', name => $data{brand}}) if $data{brand};
+       push @extra, (model => $data{model}) if $data{model};
        +{
                '@context' => 'http://schema.org/',
                '@type'    => 'Product',
                name => $data{title},
                image => "/static/fullpics/$data{product}-1.jpg",
                description => $data{subtitle},
+               @extra,
                offers => {
                        '@type' => 'Offer',
                        price => ($data{price} =~ s/(..)$/\.$1/r),
@@ -213,13 +220,13 @@ sub order_app {
                                die "Not enough of " .$prod->{title}."\n" if $prod->{quantity} > $stock;
                                $db{$$}->update(products => {stock => $stock - $prod->{quantity}}, {product => $prod->{product}});
                        }
-                       $db{$$}->insert(orders => {id => $id, %parms});
+                       $db{$$}->insert(orders => {id => $id, date => time, %parms});
                        $db{$$}->commit;
                        sendmail (Email::Simple->create(
                                header => [
                                        From    => $ENV{OOF_EMAIL_FROM},
                                        To      => $ENV{OOF_EMAIL_TO},
-                                       Subject => "Order $id placed",
+                                       Subject => "Order $id placed for ".stringify_money($parms{total}),
                                ],
                                body => 'A new order was placed.',
                        )) if $ENV{OOF_EMAIL_TO};
@@ -275,6 +282,17 @@ sub details_app {
        $tree->fid('pictures')->find('li')->iter3(\@pics, \&details_list_element);
        $tree->fid('jsonld')->replace_content(encode_json product_to_schemaorg '', %data);
 
+       $tree->fid('dd_stock')->replace_content($data{stock});
+       $tree->fid('dd_price')->replace_content(stringify_money $data{price});
+       for (qw/brand model/) {
+               if ($data{$_}) {
+                       $tree->fid("dd_$_")->replace_content($data{$_});
+               } else {
+                       $tree->fid("dt_$_")->detach;
+                       $tree->fid("dd_$_")->detach;
+               }
+       }
+
        for my $ahref ($tree->find('a')) {
                $ahref->attr(href => "/form?highlight=$id") if $ahref->attr('href') eq '/';
        }
@@ -293,6 +311,45 @@ sub pay_app {
        [200, ['Content-type' => 'text/html; charset=utf-8'], [$pay->as_HTML]];
 }
 
+sub display_table_row {
+       my ($data, $tr) = @_;
+       $tr->fclass($_)->replace_content($data->{$_}) for qw/title subtitle quantity/;
+       $tr->fclass('freepost')->detach unless $data->{freepost};
+       $tr->fclass('price')->replace_content(stringify_money $data->{subtotal});
+       $tr->fclass('title')->attr('data-product', $data->{product});
+}
+
+sub display_order {
+       my ($data, $div) = @_;
+       my @products = @{decode_json $data->{products}};
+       $div->find('table')->iter3(\@products, \&display_table_row);
+       $div->fclass('name')->replace_content($data->{first_name} . ' ' . $data->{last_name});
+       $div->fclass('stripe_token')->replace_content($data->{stripe_token}) if $data->{stripe_token};
+}
+
+my $csv_header = 'Address_line_1,Address_line_2,Address_line_3,Address_line_4,Postcode,First_name,Last_name,Email,Weight(Kg),Compensation(�),Signature(y/n),Reference,Contents,Parcel_value(�),Delivery_phone,Delivery_safe_place,Delivery_instructions' . "\n";
+
+sub make_hermes_csv {
+       my ($order) = @_;
+       my $csv = Text::CSV->new;
+       my @fields = map { $order->{$_} } qw/address1 address2 address3 address4 postcode first_name last_name email/;
+       $csv->combine(@fields, '', '', 'n', '', '', '', $order->{phone}, $order->{safe_place}, $order->{instructions});
+       $csv->string
+}
+
+sub display_app {
+       my ($env) = @_;
+       $db{$$} //= DBIx::Simple->connect($ENV{OOF_DSN} // 'dbi:Pg:');
+       my $req = Plack::Request->new($env);
+       my $n = int ($req->param('n') // 10);
+       my @orders = $db{$$}->query("SELECT * FROM orders ORDER BY date DESC LIMIT $n")->hashes;
+       my $tree = $display->clone;
+       $tree->fclass('order')->iter3(\@orders, \&display_order);
+       my $csv = join "\n", map { make_hermes_csv $_ } @orders;
+       $tree->fid('hermes_csv')->replace_content($csv_header . $csv);
+       [200, ['Content-type' => 'text/html; charset=utf-8'], [$tree->as_HTML]];
+}
+
 sub app {
        my $footer = read_file 'tmpl/footer.html';
        builder {
@@ -304,12 +361,25 @@ sub app {
                                $res;
                        }
                };
+               enable sub {
+                       my $app = shift;
+                       sub {
+                               if (-f 'down.html') {
+                                       my $down_lit = HTML::Element::Library::super_literal read_file 'down.html';
+                                       my $tree = $down->clone;
+                                       $tree->fid('content')->replace_content($down_lit);
+                                       return [503, ['Content-type' => 'text/html; charset=utf-8'], [$tree->as_HTML]]
+                               }
+                               $app->(@_)
+                       }
+               };
                mount '/' => sub { [301, [Location => '/form'], []] };
                mount '/form'     => \&form_app;
                mount '/continue' => \&continue_app;
                mount '/order'    => \&order_app;
                mount '/details'  => \&details_app;
                mount '/pay'      => \&pay_app;
+               mount '/display'  => \&display_app;
        }
 }