diff --git a/point_of_sale.rst b/point_of_sale.rst index 07707a0ee..078c1aebe 100644 --- a/point_of_sale.rst +++ b/point_of_sale.rst @@ -11,7 +11,6 @@ Point of Sale point_of_sale/shop point_of_sale/restaurant point_of_sale/payment - point_of_sale/advanced point_of_sale/advanced_pricing_features point_of_sale/analyze point_of_sale/belgian_fdm diff --git a/point_of_sale/advanced.rst b/point_of_sale/advanced.rst deleted file mode 100644 index 4a4b38cc7..000000000 --- a/point_of_sale/advanced.rst +++ /dev/null @@ -1,12 +0,0 @@ -=============== -Advanced topics -=============== - -.. toctree:: - :titlesonly: - - advanced/barcode - advanced/multicashiers - advanced/reprint - advanced/mercury - advanced/cash_rounding \ No newline at end of file diff --git a/point_of_sale/advanced/media/mercury01.png b/point_of_sale/advanced/media/mercury01.png deleted file mode 100644 index e98d9bc51..000000000 Binary files a/point_of_sale/advanced/media/mercury01.png and /dev/null differ diff --git a/point_of_sale/advanced/media/mercury03.png b/point_of_sale/advanced/media/mercury03.png deleted file mode 100644 index 0d19eca0b..000000000 Binary files a/point_of_sale/advanced/media/mercury03.png and /dev/null differ diff --git a/point_of_sale/advanced/media/mercury04.png b/point_of_sale/advanced/media/mercury04.png deleted file mode 100644 index e0d3f5ba6..000000000 Binary files a/point_of_sale/advanced/media/mercury04.png and /dev/null differ diff --git a/point_of_sale/advanced/mercury.rst b/point_of_sale/advanced/mercury.rst deleted file mode 100644 index 93457dc71..000000000 --- a/point_of_sale/advanced/mercury.rst +++ /dev/null @@ -1,48 +0,0 @@ -======================================== -Accept credit card payment using Mercury -======================================== - -A MercuryPay account (see `*MercuryPay -website* `__) is required to accept credit -card payments in Odoo 11 PoS with an integrated card reader. MercuryPay -only operates with US and Canadian banks making this procedure only -suitable for North American businesses. - -An alternative to an integrated card reader is to work with a standalone -card reader, copy the transaction total from the Odoo POS screen into -the card reader, and record the transaction in Odoo POS. - -Install Mercury -=============== - -To install Mercury go to :menuselection:`Apps` and search for the -*Mercury* module. - -.. image:: media/mercury01.png - :align: center - -Configuration -============= - -To configure mercury, you need to activate the -:doc:`Developer mode <../../general/developer_mode/activate>`. - -Now, go to :menuselection:`Point of Sale --> Configuration --> Mercury Configurations`. - -Create a new configuration for credit cards and enter your Mercury -credentials. - -.. image:: media/mercury03.png - :align: center - -Then go to :menuselection:`Point of Sale --> Configuration --> Payment -Methods` and create a new one. - -Under *Point of Sale* when you select *Use in Point of Sale* you can -then select your Mercury credentials that you just created. - -.. image:: media/mercury04.png - :align: center - -You now have a new option to pay by credit card when validating a -payment. diff --git a/point_of_sale/shop.rst b/point_of_sale/shop.rst index 2a08cb277..edbb77a98 100644 --- a/point_of_sale/shop.rst +++ b/point_of_sale/shop.rst @@ -8,3 +8,7 @@ Shop Features shop/invoice shop/refund shop/cash_control + shop/barcode + shop/multicashiers + shop/reprint + shop/cash_rounding diff --git a/point_of_sale/advanced/barcode.rst b/point_of_sale/shop/barcode.rst similarity index 100% rename from point_of_sale/advanced/barcode.rst rename to point_of_sale/shop/barcode.rst diff --git a/point_of_sale/advanced/cash_rounding.rst b/point_of_sale/shop/cash_rounding.rst similarity index 100% rename from point_of_sale/advanced/cash_rounding.rst rename to point_of_sale/shop/cash_rounding.rst diff --git a/point_of_sale/advanced/media/barcode01.png b/point_of_sale/shop/media/barcode01.png similarity index 100% rename from point_of_sale/advanced/media/barcode01.png rename to point_of_sale/shop/media/barcode01.png diff --git a/point_of_sale/advanced/media/barcode02.png b/point_of_sale/shop/media/barcode02.png similarity index 100% rename from point_of_sale/advanced/media/barcode02.png rename to point_of_sale/shop/media/barcode02.png diff --git a/point_of_sale/advanced/media/cash_rounding01.png b/point_of_sale/shop/media/cash_rounding01.png similarity index 100% rename from point_of_sale/advanced/media/cash_rounding01.png rename to point_of_sale/shop/media/cash_rounding01.png diff --git a/point_of_sale/advanced/media/cash_rounding02.png b/point_of_sale/shop/media/cash_rounding02.png similarity index 100% rename from point_of_sale/advanced/media/cash_rounding02.png rename to point_of_sale/shop/media/cash_rounding02.png diff --git a/point_of_sale/advanced/media/cash_rounding03.png b/point_of_sale/shop/media/cash_rounding03.png similarity index 100% rename from point_of_sale/advanced/media/cash_rounding03.png rename to point_of_sale/shop/media/cash_rounding03.png diff --git a/point_of_sale/advanced/media/multicashiers01.png b/point_of_sale/shop/media/multicashiers01.png similarity index 100% rename from point_of_sale/advanced/media/multicashiers01.png rename to point_of_sale/shop/media/multicashiers01.png diff --git a/point_of_sale/advanced/media/multicashiers02.png b/point_of_sale/shop/media/multicashiers02.png similarity index 100% rename from point_of_sale/advanced/media/multicashiers02.png rename to point_of_sale/shop/media/multicashiers02.png diff --git a/point_of_sale/advanced/media/multicashiers03.png b/point_of_sale/shop/media/multicashiers03.png similarity index 100% rename from point_of_sale/advanced/media/multicashiers03.png rename to point_of_sale/shop/media/multicashiers03.png diff --git a/point_of_sale/advanced/media/multicashiers04.png b/point_of_sale/shop/media/multicashiers04.png similarity index 100% rename from point_of_sale/advanced/media/multicashiers04.png rename to point_of_sale/shop/media/multicashiers04.png diff --git a/point_of_sale/advanced/media/multicashiers05.png b/point_of_sale/shop/media/multicashiers05.png similarity index 100% rename from point_of_sale/advanced/media/multicashiers05.png rename to point_of_sale/shop/media/multicashiers05.png diff --git a/point_of_sale/advanced/media/multicashiers06.png b/point_of_sale/shop/media/multicashiers06.png similarity index 100% rename from point_of_sale/advanced/media/multicashiers06.png rename to point_of_sale/shop/media/multicashiers06.png diff --git a/point_of_sale/advanced/media/multicashiers07.png b/point_of_sale/shop/media/multicashiers07.png similarity index 100% rename from point_of_sale/advanced/media/multicashiers07.png rename to point_of_sale/shop/media/multicashiers07.png diff --git a/point_of_sale/advanced/media/reprint01.png b/point_of_sale/shop/media/reprint01.png similarity index 100% rename from point_of_sale/advanced/media/reprint01.png rename to point_of_sale/shop/media/reprint01.png diff --git a/point_of_sale/advanced/media/reprint02.png b/point_of_sale/shop/media/reprint02.png similarity index 100% rename from point_of_sale/advanced/media/reprint02.png rename to point_of_sale/shop/media/reprint02.png diff --git a/point_of_sale/advanced/media/reprint03.png b/point_of_sale/shop/media/reprint03.png similarity index 100% rename from point_of_sale/advanced/media/reprint03.png rename to point_of_sale/shop/media/reprint03.png diff --git a/point_of_sale/advanced/multicashiers.rst b/point_of_sale/shop/multicashiers.rst similarity index 100% rename from point_of_sale/advanced/multicashiers.rst rename to point_of_sale/shop/multicashiers.rst diff --git a/point_of_sale/advanced/reprint.rst b/point_of_sale/shop/reprint.rst similarity index 100% rename from point_of_sale/advanced/reprint.rst rename to point_of_sale/shop/reprint.rst