Compare commits

..

2 commits

Author SHA1 Message Date
bc35f95a06 more on seller receipt 2018-08-06 21:36:26 +02:00
1607f8946e use simple iso string 2018-08-06 21:31:40 +02:00
3 changed files with 13 additions and 5 deletions

View file

@ -37,3 +37,9 @@ std::string Sale::sumAsString() { return formatCentAsEuroString(sumInCents()); }
std::string Sale::getTimestamp() const { return timestamp_; } std::string Sale::getTimestamp() const { return timestamp_; }
void Sale::setTimestamp(const std::string& timestamp) { timestamp_ = timestamp; } void Sale::setTimestamp(const std::string& timestamp) { timestamp_ = timestamp; }
std::string Sale::getTimestampFormatted() const
{
boost::posix_time::ptime time = boost::posix_time::from_iso_extended_string(timestamp_);
return boost::posix_time::to_simple_string(time);
}

View file

@ -22,6 +22,7 @@ class Sale : public Entity
ArticlesVec& getArticles(); ArticlesVec& getArticles();
std::string getTimestamp() const; std::string getTimestamp() const;
std::string getTimestampFormatted() const;
int sumInCents(); int sumInCents();
std::string sumAsString(); std::string sumAsString();

View file

@ -144,7 +144,7 @@ void PosPrinter::printSaleReceipt(Sale* sale)
std::stringstream commandStream; std::stringstream commandStream;
printHeader(); printHeader();
commandStream << Command::RESET << Command::ENCODING << Command::RIGHT_ALIGN; commandStream << Command::RESET << Command::ENCODING << Command::RIGHT_ALIGN;
commandStream << sale->getTimestamp() << "\n\n"; commandStream << sale->getTimestampFormatted() << "\n\n";
commandStream << Command::LEFT_ALIGN; commandStream << Command::LEFT_ALIGN;
for (const auto& article : sale->getArticles()) { for (const auto& article : sale->getArticles()) {
commandStream << "Art. " << article->getCompleteArticleNo() << "........... " commandStream << "Art. " << article->getCompleteArticleNo() << "........... "
@ -166,6 +166,7 @@ void PosPrinter::printSellerReceipt(Seller* seller, int percent, int maxFeeInCen
boost::posix_time::to_simple_string(boost::posix_time::second_clock::local_time()); boost::posix_time::to_simple_string(boost::posix_time::second_clock::local_time());
commandStream << timeStr << "\n\n"; commandStream << timeStr << "\n\n";
commandStream << Command::LEFT_ALIGN; commandStream << Command::LEFT_ALIGN;
commandStream << "Name: " << seller->getFirstName() << " " << seller->getLastName() << "\n";
commandStream << "Verkäufernummer: " << std::setw(4) << seller->getSellerNo() << "\n\n"; commandStream << "Verkäufernummer: " << std::setw(4) << seller->getSellerNo() << "\n\n";
commandStream << "Anzahl Artikel geliefert: " << std::setw(4) << seller->numArticlesOffered() commandStream << "Anzahl Artikel geliefert: " << std::setw(4) << seller->numArticlesOffered()
<< "\n"; << "\n";
@ -180,10 +181,10 @@ void PosPrinter::printSellerReceipt(Seller* seller, int percent, int maxFeeInCen
commandStream << "Art. " << article->getCompleteArticleNo() << "........... " commandStream << "Art. " << article->getCompleteArticleNo() << "........... "
<< article->getPriceAsString() << "\n"; << article->getPriceAsString() << "\n";
} }
commandStream << "\nGesamt................." << seller->sumAsString() << "\n"; commandStream << "\nGesamt................. " << seller->sumAsString() << "\n";
commandStream << "./. Gebühr............." commandStream << "./. Gebühr............. "
<< marketFeeAsString(seller->sumInCents(), percent, maxFeeInCent) << "\n"; << marketFeeAsString(seller->sumInCents(), percent, maxFeeInCent) << "\n";
commandStream << "\nAuszahlung............." commandStream << "\nAuszahlung............. "
<< paymentAsString(seller->sumInCents(), percent, maxFeeInCent) << "\n"; << paymentAsString(seller->sumInCents(), percent, maxFeeInCent) << "\n";
commandStream << Command::FEED; commandStream << Command::FEED;